| Index: content/renderer/scheduler/renderer_scheduler_impl.h
|
| diff --git a/content/renderer/scheduler/renderer_scheduler_impl.h b/content/renderer/scheduler/renderer_scheduler_impl.h
|
| index fcec44b80647769a32bbdf6991fd27312deed17b..8ea4335a4d0e4519b162ed81d269cf7a2767d042 100644
|
| --- a/content/renderer/scheduler/renderer_scheduler_impl.h
|
| +++ b/content/renderer/scheduler/renderer_scheduler_impl.h
|
| @@ -18,13 +18,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 content {
|
|
|
| @@ -90,7 +84,7 @@ class CONTENT_EXPORT RendererSchedulerImpl : public RendererScheduler {
|
| };
|
|
|
| // Returns the serialized scheduler state for tracing.
|
| - scoped_refptr<base::debug::ConvertableToTraceFormat> AsValueLocked(
|
| + scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValueLocked(
|
| base::TimeTicks optional_now) const;
|
| static const char* TaskQueueIdToString(QueueId queue_id);
|
| static const char* PolicyToString(Policy policy);
|
|
|