| Index: ash/test/ash_test_helper.cc
|
| diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
|
| index f5a27b4d7bf175c55301c76c9fac8eb0012b3bb2..060f8c1bee54bb80d096b65b204b0b9e5c52ca28 100644
|
| --- a/ash/test/ash_test_helper.cc
|
| +++ b/ash/test/ash_test_helper.cc
|
| @@ -118,8 +118,8 @@ void AshTestHelper::SetUp(bool start_session) {
|
| init_params.context_factory = context_factory;
|
| init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
|
| ash::Shell::CreateInstance(init_params);
|
| - aura::test::EnvTestHelper(aura::Env::GetInstance()).SetInputStateLookup(
|
| - scoped_ptr<aura::InputStateLookup>());
|
| + aura::test::EnvTestHelper(aura::Env::GetInstance())
|
| + .SetInputStateLookup(std::unique_ptr<aura::InputStateLookup>());
|
|
|
| Shell* shell = Shell::GetInstance();
|
| if (start_session) {
|
| @@ -132,7 +132,7 @@ void AshTestHelper::SetUp(bool start_session) {
|
|
|
| test_screenshot_delegate_ = new TestScreenshotDelegate();
|
| shell->accelerator_controller()->SetScreenshotDelegate(
|
| - scoped_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
|
| + std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
|
| }
|
|
|
| void AshTestHelper::TearDown() {
|
|
|