| Index: ash/accelerators/accelerator_controller_unittest.cc
|
| diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
|
| index 2d4b60d7a2e5a2c0c37c81fa3c3aa6fd78652841..738bf485c36b5ec78eab3416d424388bad478e9e 100644
|
| --- a/ash/accelerators/accelerator_controller_unittest.cc
|
| +++ b/ash/accelerators/accelerator_controller_unittest.cc
|
| @@ -1054,7 +1054,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
|
| EXPECT_FALSE(ProcessInController(hangul));
|
| DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
|
| GetController()->SetImeControlDelegate(
|
| - scoped_ptr<ImeControlDelegate>(delegate).Pass());
|
| + scoped_ptr<ImeControlDelegate>(delegate));
|
| EXPECT_EQ(0, delegate->handle_previous_ime_count());
|
| EXPECT_TRUE(ProcessInController(control_space_down));
|
| EXPECT_EQ(1, delegate->handle_previous_ime_count());
|
| @@ -1084,7 +1084,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
|
|
|
| DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
|
| GetController()->SetImeControlDelegate(
|
| - scoped_ptr<ImeControlDelegate>(delegate).Pass());
|
| + scoped_ptr<ImeControlDelegate>(delegate));
|
| EXPECT_EQ(0, delegate->handle_next_ime_count());
|
| EXPECT_FALSE(ProcessInController(shift_alt_press));
|
| EXPECT_TRUE(ProcessInController(shift_alt));
|
| @@ -1192,7 +1192,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsWorkaround139556) {
|
| TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsNoConflict) {
|
| DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
|
| GetController()->SetImeControlDelegate(
|
| - scoped_ptr<ImeControlDelegate>(delegate).Pass());
|
| + scoped_ptr<ImeControlDelegate>(delegate));
|
| ui::test::EventGenerator& generator = GetEventGenerator();
|
|
|
| // Correct sequence of a conflicting accelerator must not trigger next IME.
|
|
|