| Index: cc/layers/solid_color_layer_impl.h
|
| diff --git a/cc/layers/solid_color_layer_impl.h b/cc/layers/solid_color_layer_impl.h
|
| index a56b69b909b216feb6a76fee36e14cb20841f375..1f6aaf5a267f7d97f3c35e8fcdeda4ab80cb7294 100644
|
| --- a/cc/layers/solid_color_layer_impl.h
|
| +++ b/cc/layers/solid_color_layer_impl.h
|
| @@ -5,8 +5,10 @@
|
| #ifndef CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_
|
| #define CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/layers/layer_impl.h"
|
|
|
| @@ -14,9 +16,9 @@ namespace cc {
|
|
|
| class CC_EXPORT SolidColorLayerImpl : public LayerImpl {
|
| public:
|
| - static scoped_ptr<SolidColorLayerImpl> Create(LayerTreeImpl* tree_impl,
|
| - int id) {
|
| - return make_scoped_ptr(new SolidColorLayerImpl(tree_impl, id));
|
| + static std::unique_ptr<SolidColorLayerImpl> Create(LayerTreeImpl* tree_impl,
|
| + int id) {
|
| + return base::WrapUnique(new SolidColorLayerImpl(tree_impl, id));
|
| }
|
|
|
| static void AppendSolidQuads(RenderPass* render_pass,
|
| @@ -29,7 +31,7 @@ class CC_EXPORT SolidColorLayerImpl : public LayerImpl {
|
| ~SolidColorLayerImpl() override;
|
|
|
| // LayerImpl overrides.
|
| - scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| + std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| void AppendQuads(RenderPass* render_pass,
|
| AppendQuadsData* append_quads_data) override;
|
|
|
|
|