| Index: ui/compositor/test/test_compositor_host_android.cc
|
| diff --git a/ui/compositor/test/test_compositor_host_android.cc b/ui/compositor/test/test_compositor_host_android.cc
|
| index 2739fc2b4fdf172593f44acf4d28e18914946d05..8a5a627872967df07487fa2e28ac0645ed74fad6 100644
|
| --- a/ui/compositor/test/test_compositor_host_android.cc
|
| +++ b/ui/compositor/test/test_compositor_host_android.cc
|
| @@ -4,9 +4,10 @@
|
|
|
| #include "ui/compositor/test/test_compositor_host.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| @@ -30,7 +31,7 @@ class TestCompositorHostAndroid : public TestCompositorHost {
|
| ui::Compositor* GetCompositor() override { return compositor_.get(); }
|
|
|
| private:
|
| - scoped_ptr<ui::Compositor> compositor_;
|
| + std::unique_ptr<ui::Compositor> compositor_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestCompositorHostAndroid);
|
| };
|
|
|