| Index: chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
|
| index 33dc6534302ddd058c4a761723b6479f4cfc82ce..840f366a9cb174a33a17a1423e0e164f25ed7aad 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
|
| @@ -189,9 +189,9 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest {
|
| }
|
|
|
| private:
|
| - scoped_ptr<BrowserViewLayout> layout_;
|
| + std::unique_ptr<BrowserViewLayout> layout_;
|
| MockBrowserViewLayoutDelegate* delegate_; // Owned by |layout_|.
|
| - scoped_ptr<MockView> root_view_;
|
| + std::unique_ptr<MockView> root_view_;
|
|
|
| // Views owned by |root_view_|.
|
| MockView* top_container_;
|
| @@ -202,7 +202,7 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest {
|
| MockView* contents_web_view_;
|
| MockView* devtools_web_view_;
|
|
|
| - scoped_ptr<MockImmersiveModeController> immersive_mode_controller_;
|
| + std::unique_ptr<MockImmersiveModeController> immersive_mode_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BrowserViewLayoutTest);
|
| };
|
| @@ -243,7 +243,7 @@ TEST_F(BrowserViewLayoutTest, Layout) {
|
| }
|
|
|
| TEST_F(BrowserViewLayoutTest, LayoutDownloadShelf) {
|
| - scoped_ptr<MockView> download_shelf(new MockView(gfx::Size(800, 50)));
|
| + std::unique_ptr<MockView> download_shelf(new MockView(gfx::Size(800, 50)));
|
| layout()->set_download_shelf(download_shelf.get());
|
|
|
| // If download shelf doesn't need layout, it doesn't move the bottom edge.
|
|
|