| Index: ash/test/ash_test_helper_unittest.cc
|
| diff --git a/ash/test/ash_test_helper_unittest.cc b/ash/test/ash_test_helper_unittest.cc
|
| index 07b511788fc77ef93d46b1343324f84edf91fb27..0d2c436715f3912c680e3d27ef4d773ea7f6c1be 100644
|
| --- a/ash/test/ash_test_helper_unittest.cc
|
| +++ b/ash/test/ash_test_helper_unittest.cc
|
| @@ -36,7 +36,7 @@ class AshTestHelperTest : public testing::Test {
|
|
|
| private:
|
| base::MessageLoopForUI message_loop_;
|
| - scoped_ptr<ash::test::AshTestHelper> ash_test_helper_;
|
| + std::unique_ptr<ash::test::AshTestHelper> ash_test_helper_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AshTestHelperTest);
|
| };
|
| @@ -50,7 +50,7 @@ TEST_F(AshTestHelperTest, AshTestHelper) {
|
|
|
| // Enough state is initialized to create a window.
|
| using views::Widget;
|
| - scoped_ptr<Widget> w1(new Widget);
|
| + std::unique_ptr<Widget> w1(new Widget);
|
| Widget::InitParams params;
|
| params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
|
| params.context = ash_test_helper()->CurrentContext();
|
|
|