| Index: ash/virtual_keyboard_controller_unittest.cc
|
| diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc
|
| index 610c6d4047496106fd8a8182602d1d92a8740825..bdae09ec4223547bc2e90577720841eafa294403 100644
|
| --- a/ash/virtual_keyboard_controller_unittest.cc
|
| +++ b/ash/virtual_keyboard_controller_unittest.cc
|
| @@ -46,7 +46,7 @@ class VirtualKeyboardControllerTest : public AshTestBase {
|
|
|
| // Sets the event blocker on the maximized window controller.
|
| void SetEventBlocker(
|
| - scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker) {
|
| + std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> blocker) {
|
| Shell::GetInstance()->maximize_mode_controller()->event_blocker_ =
|
| std::move(blocker);
|
| }
|
| @@ -102,7 +102,7 @@ TEST_F(VirtualKeyboardControllerTest, RestoreKeyboardDevices) {
|
| Shell::GetInstance()
|
| ->maximize_mode_controller()
|
| ->EnableMaximizeModeWindowManager(true);
|
| - scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker(
|
| + std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> blocker(
|
| new MockEventBlocker);
|
| SetEventBlocker(std::move(blocker));
|
| }
|
|
|