| Index: ui/compositor/compositor_unittest.cc
|
| diff --git a/ui/compositor/compositor_unittest.cc b/ui/compositor/compositor_unittest.cc
|
| index 50180ad1edb9bdb28fd97dab8ea96103727add9b..1682482f1564b680520f1a2d346c80b3eccc4a95 100644
|
| --- a/ui/compositor/compositor_unittest.cc
|
| +++ b/ui/compositor/compositor_unittest.cc
|
| @@ -56,7 +56,7 @@ class CompositorTest : public testing::Test {
|
|
|
| private:
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| - scoped_ptr<ui::Compositor> compositor_;
|
| + std::unique_ptr<ui::Compositor> compositor_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CompositorTest);
|
| };
|
| @@ -203,7 +203,7 @@ TEST_F(CompositorTest, ReleaseWidgetWithOutputSurfaceNeverCreated) {
|
| }
|
|
|
| TEST_F(CompositorTest, CreateAndReleaseOutputSurface) {
|
| - scoped_ptr<Layer> root_layer(new Layer(ui::LAYER_SOLID_COLOR));
|
| + std::unique_ptr<Layer> root_layer(new Layer(ui::LAYER_SOLID_COLOR));
|
| root_layer->SetBounds(gfx::Rect(10, 10));
|
| compositor()->SetRootLayer(root_layer.get());
|
| compositor()->SetScaleAndSize(1.0f, gfx::Size(10, 10));
|
|
|