Index: cc/resources/pixel_buffer_tile_task_worker_pool.h |
diff --git a/cc/resources/pixel_buffer_tile_task_worker_pool.h b/cc/resources/pixel_buffer_tile_task_worker_pool.h |
index edff89a13b21ff0102dbcfddac7f33899709e8af..82e59163502250e39e5ca224f27446c6a780f094 100644 |
--- a/cc/resources/pixel_buffer_tile_task_worker_pool.h |
+++ b/cc/resources/pixel_buffer_tile_task_worker_pool.h |
@@ -20,14 +20,7 @@ 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 |
namespace cc { |
class ResourceProvider; |
@@ -101,8 +94,10 @@ class CC_EXPORT PixelBufferTileTaskWorkerPool : public TileTaskWorkerPool, |
void CheckForCompletedRasterizerTasks(); |
const char* StateName() const; |
- scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const; |
- void ThrottleStateAsValueInto(base::debug::TracedValue* throttle_state) const; |
+ scoped_refptr<base::trace_event::ConvertableToTraceFormat> StateAsValue() |
+ const; |
+ void ThrottleStateAsValueInto( |
+ base::trace_event::TracedValue* throttle_state) const; |
scoped_refptr<base::SequencedTaskRunner> task_runner_; |
TaskGraphRunner* task_graph_runner_; |