| Index: cc/input/top_controls_manager_unittest.cc
|
| diff --git a/cc/input/top_controls_manager_unittest.cc b/cc/input/top_controls_manager_unittest.cc
|
| index b2ee9bf47270b57fe40c15b050bb817208f2f604..60ea43b9e19a232e39c4aae6c2e37fd3b198453b 100644
|
| --- a/cc/input/top_controls_manager_unittest.cc
|
| +++ b/cc/input/top_controls_manager_unittest.cc
|
| @@ -6,9 +6,9 @@
|
|
|
| #include <algorithm>
|
| #include <cmath>
|
| +#include <memory>
|
|
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "cc/input/top_controls_manager_client.h"
|
| #include "cc/layers/layer_impl.h"
|
| @@ -87,9 +87,9 @@ class MockTopControlsManagerClient : public TopControlsManagerClient {
|
| TestSharedBitmapManager shared_bitmap_manager_;
|
| TestTaskGraphRunner task_graph_runner_;
|
| FakeLayerTreeHostImpl host_impl_;
|
| - scoped_ptr<LayerTreeImpl> active_tree_;
|
| - scoped_ptr<LayerImpl> root_scroll_layer_;
|
| - scoped_ptr<TopControlsManager> manager_;
|
| + std::unique_ptr<LayerTreeImpl> active_tree_;
|
| + std::unique_ptr<LayerImpl> root_scroll_layer_;
|
| + std::unique_ptr<TopControlsManager> manager_;
|
| bool redraw_needed_;
|
| bool update_draw_properties_needed_;
|
|
|
|
|