| Index: cc/layers/layer_client.h
|
| diff --git a/cc/layers/layer_client.h b/cc/layers/layer_client.h
|
| index efdbe5105a11916268f72b3bc91870463ebb4038..bcdf1c3c77d7124d5b82c9daec769ec7c37d7c28 100644
|
| --- a/cc/layers/layer_client.h
|
| +++ b/cc/layers/layer_client.h
|
| @@ -14,13 +14,7 @@ namespace base {
|
| namespace trace_event {
|
| class ConvertableToTraceFormat;
|
| }
|
| -
|
| -// 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;
|
| }
|
| -} // namespace base
|
|
|
| namespace cc {
|
|
|
| @@ -30,7 +24,7 @@ class CC_EXPORT LayerClient {
|
| // If not, returns nullptr.
|
| // If the returned pointer is non-nullptr, the caller takes
|
| // ownership of the pointer.
|
| - virtual scoped_refptr<base::debug::ConvertableToTraceFormat>
|
| + virtual scoped_refptr<base::trace_event::ConvertableToTraceFormat>
|
| TakeDebugInfo() = 0;
|
|
|
| protected:
|
|
|