Remove "mixin" from BeginFrameSource/Observer base classes.

content/renderer/gpu/compositor_external_begin_frame_source.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_
 #define CONTENT_RENDERER_GPU_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "content/renderer/gpu/compositor_forwarding_message_filter.h"
 
 namespace IPC {
 class Message;
 class SyncMessageFilter;
 }
 
 namespace content {
 
 // This class can be created only on the main thread, but then becomes pinned
 // to a fixed thread where cc::Scheduler is running.
 class CompositorExternalBeginFrameSource
-    : public cc::BeginFrameSourceMixIn,
+    : public cc::BeginFrameSourceBase,
       public NON_EXPORTED_BASE(base::NonThreadSafe) {
  public:
   explicit CompositorExternalBeginFrameSource(
       CompositorForwardingMessageFilter* filter,
       IPC::SyncMessageFilter* sync_message_filter,
       int routing_id);
   ~CompositorExternalBeginFrameSource() override;
 
-  // cc::BeginFrameSourceMixIn implementation.
+  // cc::BeginFrameSourceBase implementation.
   void OnNeedsBeginFramesChange(bool needs_begin_frames) override;
   void SetClientReady() override;
 
  private:
   class CompositorExternalBeginFrameSourceProxy
       : public base::RefCountedThreadSafe<
                    CompositorExternalBeginFrameSourceProxy> {
    public:
     explicit CompositorExternalBeginFrameSourceProxy(
         CompositorExternalBeginFrameSource* begin_frame_source)
@@ skipping 25 matching lines @@
   scoped_refptr<IPC::SyncMessageFilter> message_sender_;
   int routing_id_;
   CompositorForwardingMessageFilter::Handler begin_frame_source_filter_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorExternalBeginFrameSource);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_GPU_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_