Update from https://crrev.com/316786

cc/scheduler/scheduler_settings.h

Index: cc/scheduler/scheduler_settings.h
diff --git a/cc/scheduler/scheduler_settings.h b/cc/scheduler/scheduler_settings.h
index 90c1a9c30f85b936cebecc786f0235bae668d351..fe90f431e254ffb319b37deb680782bcd9ebf7ce 100644
--- a/cc/scheduler/scheduler_settings.h
+++ b/cc/scheduler/scheduler_settings.h
@@ -14,13 +14,7 @@ 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;
 }
-}  // namespace base
 
 namespace cc {
 class LayerTreeSettings;
@@ -49,7 +43,7 @@ class CC_EXPORT SchedulerSettings {
 
   base::TimeDelta background_frame_interval;
 
-  scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
 };
 
 }  // namespace cc