Remove "mixin" from BeginFrameSource/Observer base classes.

cc/scheduler/begin_frame_source.cc

 // 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.
 
 #include "cc/scheduler/begin_frame_source.h"
 
 #include "base/auto_reset.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 10 matching lines @@
   TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("cc.debug.scheduler.frames"), \
                name,                                                   \
                arg1_name,                                              \
                arg1_val,                                               \
                arg2_name,                                              \
                arg2_val);
 #endif
 
 namespace cc {
 
-// BeginFrameObserverMixIn -----------------------------------------------
-BeginFrameObserverMixIn::BeginFrameObserverMixIn()
+// BeginFrameObserverBase -----------------------------------------------
+BeginFrameObserverBase::BeginFrameObserverBase()
     : last_begin_frame_args_(), dropped_begin_frame_args_(0) {
 }
 
-const BeginFrameArgs BeginFrameObserverMixIn::LastUsedBeginFrameArgs() const {
+const BeginFrameArgs BeginFrameObserverBase::LastUsedBeginFrameArgs() const {
   return last_begin_frame_args_;
 }
-void BeginFrameObserverMixIn::OnBeginFrame(const BeginFrameArgs& args) {
-  DEBUG_FRAMES("BeginFrameObserverMixIn::OnBeginFrame",
+void BeginFrameObserverBase::OnBeginFrame(const BeginFrameArgs& args) {
+  DEBUG_FRAMES("BeginFrameObserverBase::OnBeginFrame",
                "last args",
                last_begin_frame_args_.AsValue(),
                "new args",
                args.AsValue());
   DCHECK(args.IsValid());
   DCHECK(args.frame_time >= last_begin_frame_args_.frame_time);
   bool used = OnBeginFrameMixInDelegate(args);
   if (used) {
     last_begin_frame_args_ = args;
   } else {
     ++dropped_begin_frame_args_;
   }
 }
 
-void BeginFrameObserverMixIn::AsValueInto(
+void BeginFrameObserverBase::AsValueInto(
     base::trace_event::TracedValue* dict) const {
   dict->BeginDictionary("last_begin_frame_args_");
   last_begin_frame_args_.AsValueInto(dict);
   dict->EndDictionary();
   dict->SetInteger("dropped_begin_frame_args_", dropped_begin_frame_args_);
 }
 
 // BeginFrameSourceMixIn ------------------------------------------------------
 BeginFrameSourceMixIn::BeginFrameSourceMixIn()
     : observer_(NULL),
@@ skipping 403 matching lines @@
   if (!observer_->LastUsedBeginFrameArgs().IsValid())
     return true;
 
   // Only allow new args have a *strictly bigger* frame_time value and statisfy
   // minimum interval requirement.
   return (args.frame_time >=
           observer_->LastUsedBeginFrameArgs().frame_time + minimum_interval_);
 }
 
 }  // namespace cc