| Index: components/mus/ws/test_utils.h
|
| diff --git a/components/mus/ws/test_utils.h b/components/mus/ws/test_utils.h
|
| index 9918185feb70b5eedb521c776d7495118501ebe1..c5c484f93e9b5fcb7d60d8f88c089420048c63bf 100644
|
| --- a/components/mus/ws/test_utils.h
|
| +++ b/components/mus/ws/test_utils.h
|
| @@ -326,7 +326,7 @@ class TestWindowTreeBinding : public WindowTreeBinding {
|
| WindowTree* tree_;
|
| TestWindowTreeClient client_;
|
| bool is_paused_ = false;
|
| - scoped_ptr<TestWindowManager> window_manager_;
|
| + std::unique_ptr<TestWindowManager> window_manager_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestWindowTreeBinding);
|
| };
|
| @@ -362,7 +362,7 @@ class TestWindowServerDelegate : public WindowServerDelegate {
|
|
|
| // WindowServerDelegate:
|
| void OnNoMoreDisplays() override;
|
| - scoped_ptr<WindowTreeBinding> CreateWindowTreeBinding(
|
| + std::unique_ptr<WindowTreeBinding> CreateWindowTreeBinding(
|
| BindingType type,
|
| ws::WindowServer* window_server,
|
| ws::WindowTree* tree,
|
|
|