| Index: cc/layers/layer_client.h
|
| diff --git a/cc/layers/layer_client.h b/cc/layers/layer_client.h
|
| index fa33f92b13247b22b2deb1f52156bd077d1a878d..8f9310f2f4a49e5dff885e93cc8183ec8d6f18ad 100644
|
| --- a/cc/layers/layer_client.h
|
| +++ b/cc/layers/layer_client.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef CC_LAYERS_LAYER_CLIENT_H_
|
| #define CC_LAYERS_LAYER_CLIENT_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "cc/base/cc_export.h"
|
|
|
| namespace base {
|
| @@ -27,8 +28,8 @@ class CC_EXPORT LayerClient {
|
| //
|
| // A pointer to the layer is provided for the convenience of layer clients
|
| // which service multiple layers.
|
| - virtual scoped_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo(
|
| - Layer* layer) = 0;
|
| + virtual std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
|
| + TakeDebugInfo(Layer* layer) = 0;
|
|
|
| protected:
|
| virtual ~LayerClient() {}
|
|
|