| Index: ash/virtual_keyboard_controller_unittest.cc
|
| diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc
|
| index f7a59ef7e72b1b5f28e7cf1ed7a710ca81ac26a0..610c6d4047496106fd8a8182602d1d92a8740825 100644
|
| --- a/ash/virtual_keyboard_controller_unittest.cc
|
| +++ b/ash/virtual_keyboard_controller_unittest.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "ash/virtual_keyboard_controller.h"
|
|
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "ash/shell.h"
|
| @@ -47,7 +48,7 @@ class VirtualKeyboardControllerTest : public AshTestBase {
|
| void SetEventBlocker(
|
| scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker) {
|
| Shell::GetInstance()->maximize_mode_controller()->event_blocker_ =
|
| - blocker.Pass();
|
| + std::move(blocker);
|
| }
|
|
|
| void SetUp() override {
|
| @@ -103,7 +104,7 @@ TEST_F(VirtualKeyboardControllerTest, RestoreKeyboardDevices) {
|
| ->EnableMaximizeModeWindowManager(true);
|
| scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker(
|
| new MockEventBlocker);
|
| - SetEventBlocker(blocker.Pass());
|
| + SetEventBlocker(std::move(blocker));
|
| }
|
|
|
| class VirtualKeyboardControllerAutoTest : public VirtualKeyboardControllerTest,
|
|
|