Remove "mixin" from BeginFrameSource/Observer base classes.

cc/surfaces/display_scheduler.h

 // Copyright 2015 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 CC_SURFACES_DISPLAY_SCHEDULER_H_
 #define CC_SURFACES_DISPLAY_SCHEDULER_H_
 
 #include "base/cancelable_callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
 
 class OutputSurface;
 class BeginFrameSource;
 
 // TODO(brianderson): Reconcile with SurfacesScheduler crbug.com/476676
 class CC_SURFACES_EXPORT DisplaySchedulerClient {
  public:
   virtual ~DisplaySchedulerClient() {}
 
   virtual bool DrawAndSwap() = 0;
 };
 
-class CC_SURFACES_EXPORT DisplayScheduler : public BeginFrameObserverMixIn {
+class CC_SURFACES_EXPORT DisplayScheduler : public BeginFrameObserverBase {
  public:
   DisplayScheduler(DisplaySchedulerClient* client,
                    BeginFrameSource* begin_frame_source,
                    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
                    int max_pending_swaps);
   ~DisplayScheduler() override;
 
   void SetRootSurfaceResourcesLocked(bool locked);
   void ForceImmediateSwapIfPossible();
   virtual void EntireDisplayDamaged(SurfaceId root_surface_id);
   virtual void SurfaceDamaged(SurfaceId surface_id);
 
   virtual void DidSwapBuffers();
   void DidSwapBuffersComplete();
 
   void OutputSurfaceLost();
 
-  // BeginFrameObserverMixIn implementation
-  bool OnBeginFrameMixInDelegate(const BeginFrameArgs& args) override;
+  // BeginFrameObserverBase implementation
+  bool OnBeginFrameDerivedImpl(const BeginFrameArgs& args) override;
 
  protected:
   base::TimeTicks DesiredBeginFrameDeadlineTime();
   virtual void ScheduleBeginFrameDeadline();
   void AttemptDrawAndSwap();
   void OnBeginFrameDeadline();
   void DrawAndSwap();
 
   DisplaySchedulerClient* client_;
   BeginFrameSource* begin_frame_source_;
@@ skipping 25 matching lines @@
 
   base::WeakPtrFactory<DisplayScheduler> weak_ptr_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisplayScheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_DISPLAY_SCHEDULER_H_