Index: chrome/browser/ui/ash/window_positioner_unittest.cc |
diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc |
index 255a141c323bebf7d76e10dad2ea032084dde1d2..604510802c9d42b26c593121cb24997bfbda3203 100644 |
--- a/chrome/browser/ui/ash/window_positioner_unittest.cc |
+++ b/chrome/browser/ui/ash/window_positioner_unittest.cc |
@@ -45,12 +45,12 @@ class WindowPositionerTest : public AshTestBase { |
const int grid_size_; |
private: |
- scoped_ptr<WindowPositioner> window_positioner_; |
+ std::unique_ptr<WindowPositioner> window_positioner_; |
TestingProfile profile_; |
- scoped_ptr<Browser> browser_; |
- scoped_ptr<Browser> browser_popup_; |
+ std::unique_ptr<Browser> browser_; |
+ std::unique_ptr<Browser> browser_popup_; |
DISALLOW_COPY_AND_ASSIGN(WindowPositionerTest); |
}; |
@@ -61,9 +61,9 @@ WindowPositionerTest::WindowPositionerTest() |
void WindowPositionerTest::SetUp() { |
AshTestBase::SetUp(); |
// Create some default dummy windows. |
- scoped_ptr<aura::Window> dummy_window(CreateTestWindowInShellWithId(0)); |
+ std::unique_ptr<aura::Window> dummy_window(CreateTestWindowInShellWithId(0)); |
dummy_window->SetBounds(gfx::Rect(16, 32, 640, 320)); |
- scoped_ptr<aura::Window> dummy_popup(CreateTestWindowInShellWithId(1)); |
+ std::unique_ptr<aura::Window> dummy_popup(CreateTestWindowInShellWithId(1)); |
dummy_popup->SetBounds(gfx::Rect(16, 32, 128, 256)); |
// Create a browser for the window. |