Update from https://crrev.com/316786

cc/scheduler/begin_frame_source.h

Index: cc/scheduler/begin_frame_source.h
diff --git a/cc/scheduler/begin_frame_source.h b/cc/scheduler/begin_frame_source.h
index 1612a286e26a1a9c969f1d1c758046011a8ae576..d845dacd8e417505e27b3663246ae38c53234285 100644
--- a/cc/scheduler/begin_frame_source.h
+++ b/cc/scheduler/begin_frame_source.h
@@ -50,7 +50,7 @@ class CC_EXPORT BeginFrameObserver {
   virtual const BeginFrameArgs LastUsedBeginFrameArgs() const = 0;
 
   // Tracing support
-  virtual void AsValueInto(base::debug::TracedValue* dict) const = 0;
+  virtual void AsValueInto(base::trace_event::TracedValue* dict) const = 0;
 };
 
 // Simple mix in which implements a BeginFrameObserver which checks the
@@ -75,7 +75,7 @@ class CC_EXPORT BeginFrameObserverMixIn : public BeginFrameObserver {
   const BeginFrameArgs LastUsedBeginFrameArgs() const override;
 
   // Outputs last_begin_frame_args_
-  void AsValueInto(base::debug::TracedValue* dict) const override;
+  void AsValueInto(base::trace_event::TracedValue* dict) const override;
 
  protected:
   // Subclasses should override this method!
@@ -122,7 +122,7 @@ class CC_EXPORT BeginFrameSource {
 
   // Tracing support - Recommend (but not required) to call this implementation
   // in any override.
-  virtual void AsValueInto(base::debug::TracedValue* dict) const = 0;
+  virtual void AsValueInto(base::trace_event::TracedValue* dict) const = 0;
 };
 
 // Simple mix in which implements a BeginFrameSource.
@@ -137,7 +137,7 @@ class CC_EXPORT BeginFrameSourceMixIn : public BeginFrameSource {
   ~BeginFrameSourceMixIn() override {}
 
   // BeginFrameSource
-  bool NeedsBeginFrames() const override;
+  bool NeedsBeginFrames() const final;
   void SetNeedsBeginFrames(bool needs_begin_frames) final;
   void DidFinishFrame(size_t remaining_frames) override {}
   void AddObserver(BeginFrameObserver* obs) final;
@@ -146,7 +146,7 @@ class CC_EXPORT BeginFrameSourceMixIn : public BeginFrameSource {
 
   // Tracing support - Recommend (but not required) to call this implementation
   // in any override.
-  void AsValueInto(base::debug::TracedValue* dict) const override;
+  void AsValueInto(base::trace_event::TracedValue* dict) const override;
 
  protected:
   BeginFrameSourceMixIn();
@@ -178,7 +178,7 @@ class CC_EXPORT BackToBackBeginFrameSource : public BeginFrameSourceMixIn {
   void DidFinishFrame(size_t remaining_frames) override;
 
   // Tracing
-  void AsValueInto(base::debug::TracedValue* dict) const override;
+  void AsValueInto(base::trace_event::TracedValue* dict) const override;
 
  protected:
   explicit BackToBackBeginFrameSource(
@@ -210,11 +210,8 @@ class CC_EXPORT SyntheticBeginFrameSource : public BeginFrameSourceMixIn,
       base::TimeDelta initial_vsync_interval);
   ~SyntheticBeginFrameSource() override;
 
-  // BeginFrameSource
-  bool NeedsBeginFrames() const override;
-
   // Tracing
-  void AsValueInto(base::debug::TracedValue* dict) const override;
+  void AsValueInto(base::trace_event::TracedValue* dict) const override;
 
   // VSyncParameterObserver
   void OnUpdateVSyncParameters(base::TimeTicks new_vsync_timebase,
@@ -260,14 +257,13 @@ class CC_EXPORT BeginFrameSourceMultiplexer : public BeginFrameSourceMixIn,
   const BeginFrameArgs LastUsedBeginFrameArgs() const override;
 
   // BeginFrameSource
-  bool NeedsBeginFrames() const override;
   void DidFinishFrame(size_t remaining_frames) override;
 
   // BeginFrameSourceMixIn
   void OnNeedsBeginFramesChange(bool needs_begin_frames) override;
 
   // Tracing
-  void AsValueInto(base::debug::TracedValue* dict) const override;
+  void AsValueInto(base::trace_event::TracedValue* dict) const override;
 
  protected:
   BeginFrameSourceMultiplexer();