Update from https://crrev.com/316786

cc/scheduler/scheduler.h

Index: cc/scheduler/scheduler.h
diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h
index ddc3f2f54ac7c1ba90723d8ba99aabcdfbace0c3..82f305a298411b272b55b6fa3df42a26c0a3917f 100644
--- a/cc/scheduler/scheduler.h
+++ b/cc/scheduler/scheduler.h
@@ -27,14 +27,8 @@ namespace base {
 namespace trace_event {
 class ConvertableToTraceFormat;
 }
-
-// TODO(ssid): remove these aliases after the tracing clients are moved to the
-// new trace_event namespace. See crbug.com/451032. ETA: March 2015
-namespace debug {
-using ::base::trace_event::ConvertableToTraceFormat;
-}
 class SingleThreadTaskRunner;
-}  // namespace base
+}
 
 namespace cc {
 
@@ -170,8 +164,8 @@ class CC_EXPORT Scheduler : public BeginFrameObserverMixIn,
 
   void SetDeferCommits(bool defer_commits);
 
-  scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
-  void AsValueInto(base::debug::TracedValue* value) const override;
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
+  void AsValueInto(base::trace_event::TracedValue* value) const override;
 
   void SetContinuousPainting(bool continuous_painting) {
     state_machine_.SetContinuousPainting(continuous_painting);