| Index: cc/debug/traced_value.h
|
| diff --git a/cc/debug/traced_value.h b/cc/debug/traced_value.h
|
| index db0a08aaf951a59e87583c27e2f4487bd9054bb2..34e79a7a06237c0dfe206f949786d7484d460d0d 100644
|
| --- a/cc/debug/traced_value.h
|
| +++ b/cc/debug/traced_value.h
|
| @@ -9,33 +9,28 @@ namespace base {
|
| namespace trace_event {
|
| class TracedValue;
|
| }
|
| -
|
| -// 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::TracedValue;
|
| }
|
| -} // namespace base
|
|
|
| namespace cc {
|
|
|
| class TracedValue {
|
| public:
|
| - static void AppendIDRef(const void* id, base::debug::TracedValue* array);
|
| + static void AppendIDRef(const void* id,
|
| + base::trace_event::TracedValue* array);
|
| static void SetIDRef(const void* id,
|
| - base::debug::TracedValue* dict,
|
| + base::trace_event::TracedValue* dict,
|
| const char* name);
|
| - static void MakeDictIntoImplicitSnapshot(base::debug::TracedValue* dict,
|
| + static void MakeDictIntoImplicitSnapshot(base::trace_event::TracedValue* dict,
|
| const char* object_name,
|
| const void* id);
|
| static void MakeDictIntoImplicitSnapshotWithCategory(
|
| const char* category,
|
| - base::debug::TracedValue* dict,
|
| + base::trace_event::TracedValue* dict,
|
| const char* object_name,
|
| const void* id);
|
| static void MakeDictIntoImplicitSnapshotWithCategory(
|
| const char* category,
|
| - base::debug::TracedValue* dict,
|
| + base::trace_event::TracedValue* dict,
|
| const char* object_base_type_name,
|
| const char* object_name,
|
| const void* id);
|
|
|