| Index: cc/blink/web_layer_impl.h
|
| diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
|
| index 787f63201cf97166ebe6f51954f4e84c2f4473c9..83f6cf2721fe0457bb78da59cfb9e80aedf29e11 100644
|
| --- a/cc/blink/web_layer_impl.h
|
| +++ b/cc/blink/web_layer_impl.h
|
| @@ -34,13 +34,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 {
|
| class Layer;
|
| @@ -141,7 +135,8 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
|
| virtual void setWebLayerClient(blink::WebLayerClient* client);
|
|
|
| // LayerClient implementation.
|
| - scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() override;
|
| + scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo()
|
| + override;
|
|
|
| virtual void setScrollParent(blink::WebLayer* parent);
|
| virtual void setClipParent(blink::WebLayer* parent);
|
|
|