| Index: content/child/child_thread.h
|
| diff --git a/content/child/child_thread.h b/content/child/child_thread.h
|
| index 24cfc61f22cbbaf37a51e700b1764c09dee9240b..22886fa85cd49bf90b1719432e852be33e1fc6dd 100644
|
| --- a/content/child/child_thread.h
|
| +++ b/content/child/child_thread.h
|
| @@ -21,8 +21,14 @@
|
| namespace base {
|
| class MessageLoop;
|
|
|
| -namespace debug {
|
| +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
|
|
|
|
|