| Index: content/child/child_thread_impl.h
|
| diff --git a/content/child/child_thread_impl.h b/content/child/child_thread_impl.h
|
| index 6f1727afedfae9e93898be931c791d994c0d190f..4016861820ae15b4ca009ca52a801256fe642471 100644
|
| --- a/content/child/child_thread_impl.h
|
| +++ b/content/child/child_thread_impl.h
|
| @@ -25,12 +25,6 @@ class MessageLoop;
|
| namespace trace_event {
|
| class TraceMemoryController;
|
| } // namespace trace_event
|
| -
|
| -// 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::TraceMemoryController;
|
| -} // namespace debug
|
| } // namespace base
|
|
|
| namespace IPC {
|
| @@ -295,7 +289,7 @@ class CONTENT_EXPORT ChildThreadImpl
|
|
|
| // Observes the trace event system. When tracing is enabled, optionally
|
| // starts profiling the tcmalloc heap.
|
| - scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_;
|
| + scoped_ptr<base::trace_event::TraceMemoryController> trace_memory_controller_;
|
|
|
| scoped_ptr<base::PowerMonitor> power_monitor_;
|
|
|
|
|