Index: cc/output/begin_frame_args.h |
diff --git a/cc/output/begin_frame_args.h b/cc/output/begin_frame_args.h |
index 53745f9d81e9e262e8aac52fc4dba4c3bb743091..47430ca9f2963dc15318a65de722d4c39c0e52d0 100644 |
--- a/cc/output/begin_frame_args.h |
+++ b/cc/output/begin_frame_args.h |
@@ -12,11 +12,18 @@ |
#include "cc/base/cc_export.h" |
namespace base { |
-namespace debug { |
+namespace trace_event { |
class ConvertableToTraceFormat; |
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::ConvertableToTraceFormat; |
+using ::base::trace_event::TracedValue; |
} |
+} // namespace base |
/** |
* In debug builds we trace the creation origin of BeginFrameArgs objects. We |