Update from https://crrev.com/316786

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 35 matching lines @@
   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(
-    base::debug::TracedValue* dict) const {
+    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),
       needs_begin_frames_(false),
@@ skipping 43 matching lines @@
                "current observer",
                observer_,
                "args",
                args.AsValue());
   if (observer_) {
     return observer_->OnBeginFrame(args);
   }
 }
 
 // Tracing support
-void BeginFrameSourceMixIn::AsValueInto(base::debug::TracedValue* dict) const {
+void BeginFrameSourceMixIn::AsValueInto(
+    base::trace_event::TracedValue* dict) const {
   // As the observer might try to trace the source, prevent an infinte loop
   // from occuring.
   if (inside_as_value_into_) {
     dict->SetString("observer", "<loop detected>");
     return;
   }
 
   if (observer_) {
     base::AutoReset<bool> prevent_loops(
         const_cast<bool*>(&inside_as_value_into_), true);
@@ skipping 60 matching lines @@
 // BeginFrameSource support
 
 void BackToBackBeginFrameSource::DidFinishFrame(size_t remaining_frames) {
   if (remaining_frames == 0) {
     OnNeedsBeginFramesChange(NeedsBeginFrames());
   }
 }
 
 // Tracing support
 void BackToBackBeginFrameSource::AsValueInto(
-    base::debug::TracedValue* dict) const {
+    base::trace_event::TracedValue* dict) const {
   dict->SetString("type", "BackToBackBeginFrameSource");
   BeginFrameSourceMixIn::AsValueInto(dict);
   dict->SetBoolean("send_begin_frame_posted_", send_begin_frame_posted_);
 }
 
 // SyntheticBeginFrameSource ---------------------------------------------
 scoped_ptr<SyntheticBeginFrameSource> SyntheticBeginFrameSource::Create(
     base::SingleThreadTaskRunner* task_runner,
     base::TimeTicks initial_vsync_timebase,
     base::TimeDelta initial_vsync_interval) {
@@ skipping 45 matching lines @@
 void SyntheticBeginFrameSource::OnNeedsBeginFramesChange(
     bool needs_begin_frames) {
   base::TimeTicks missed_tick_time =
       time_source_->SetActive(needs_begin_frames);
   if (!missed_tick_time.is_null()) {
     CallOnBeginFrame(
         CreateBeginFrameArgs(missed_tick_time, BeginFrameArgs::MISSED));
   }
 }
 
-bool SyntheticBeginFrameSource::NeedsBeginFrames() const {
-  return time_source_->Active();
-}
-
 // Tracing support
 void SyntheticBeginFrameSource::AsValueInto(
-    base::debug::TracedValue* dict) const {
+    base::trace_event::TracedValue* dict) const {
   dict->SetString("type", "SyntheticBeginFrameSource");
   BeginFrameSourceMixIn::AsValueInto(dict);
 
   dict->BeginDictionary("time_source");
   time_source_->AsValueInto(dict);
   dict->EndDictionary();
 }
 
 // BeginFrameSourceMultiplexer -------------------------------------------
 scoped_ptr<BeginFrameSourceMultiplexer> BeginFrameSourceMultiplexer::Create() {
@@ skipping 115 matching lines @@
 
 const BeginFrameArgs BeginFrameSourceMultiplexer::LastUsedBeginFrameArgs()
     const {
   if (observer_)
     return observer_->LastUsedBeginFrameArgs();
   else
     return BeginFrameArgs();
 }
 
 // BeginFrameSource support
-bool BeginFrameSourceMultiplexer::NeedsBeginFrames() const {
-  if (active_source_) {
-    return active_source_->NeedsBeginFrames();
-  } else {
-    return false;
-  }
-}
-
 void BeginFrameSourceMultiplexer::OnNeedsBeginFramesChange(
     bool needs_begin_frames) {
   DEBUG_FRAMES("BeginFrameSourceMultiplexer::OnNeedsBeginFramesChange",
                "active_source", active_source_, "needs_begin_frames",
                needs_begin_frames);
   if (active_source_) {
     active_source_->SetNeedsBeginFrames(needs_begin_frames);
   } else {
     DCHECK(!needs_begin_frames);
   }
 }
 
 void BeginFrameSourceMultiplexer::DidFinishFrame(size_t remaining_frames) {
   DEBUG_FRAMES("BeginFrameSourceMultiplexer::DidFinishFrame",
                "active_source",
                active_source_,
                "remaining_frames",
                remaining_frames);
   if (active_source_) {
     active_source_->DidFinishFrame(remaining_frames);
   }
 }
 
 // Tracing support
 void BeginFrameSourceMultiplexer::AsValueInto(
-    base::debug::TracedValue* dict) const {
+    base::trace_event::TracedValue* dict) const {
   dict->SetString("type", "BeginFrameSourceMultiplexer");
 
   dict->SetInteger("minimum_interval_us", minimum_interval_.InMicroseconds());
   if (observer_) {
     dict->BeginDictionary("last_begin_frame_args");
     observer_->LastUsedBeginFrameArgs().AsValueInto(dict);
     dict->EndDictionary();
   }
 
   if (active_source_) {
@@ skipping 29 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