Update from https://crrev.com/316786

cc/scheduler/scheduler_settings.h

 // Copyright 2013 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.
 
 #ifndef CC_SCHEDULER_SCHEDULER_SETTINGS_H_
 #define CC_SCHEDULER_SCHEDULER_SETTINGS_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "cc/base/cc_export.h"
 
 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;
 
 class CC_EXPORT SchedulerSettings {
  public:
   SchedulerSettings();
   explicit SchedulerSettings(const LayerTreeSettings& settings);
   ~SchedulerSettings();
 
   bool use_external_begin_frame_source;
   bool forward_begin_frames_to_children;
   bool main_frame_before_activation_enabled;
   bool impl_side_painting;
   bool timeout_and_draw_when_animation_checkerboards;
   int maximum_number_of_failed_draws_before_draw_is_forced_;
   bool using_synchronous_renderer_compositor;
   bool throttle_frame_production;
   bool disable_hi_res_timer_tasks_on_battery;
 
   // In main thread low latency mode the entire
   // BeginMainFrame->Commit->Activation->Draw cycle should complete before
   // starting the next cycle.  Additionally, BeginMainFrame and Commit are
   // completed atomically with no other tasks or actions occuring between them.
   bool main_thread_should_always_be_low_latency;
 
   base::TimeDelta background_frame_interval;
 
-  scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_SETTINGS_H_