Convert Pass()→std::move() in //ash

ash/accelerators/accelerator_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 1036 matching lines @@
     const ui::Accelerator hangul(ui::VKEY_HANGUL, ui::EF_NONE);
     EXPECT_FALSE(ProcessInController(control_space_down));
     EXPECT_FALSE(ProcessInController(control_space_up));
     EXPECT_FALSE(ProcessInController(convert));
     EXPECT_FALSE(ProcessInController(non_convert));
     EXPECT_FALSE(ProcessInController(wide_half_1));
     EXPECT_FALSE(ProcessInController(wide_half_2));
     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());
     EXPECT_TRUE(ProcessInController(control_space_up));
     EXPECT_EQ(1, delegate->handle_previous_ime_count());
     EXPECT_EQ(0, delegate->handle_switch_ime_count());
     EXPECT_TRUE(ProcessInController(convert));
     EXPECT_EQ(1, delegate->handle_switch_ime_count());
     EXPECT_TRUE(ProcessInController(non_convert));
     EXPECT_EQ(2, delegate->handle_switch_ime_count());
     EXPECT_TRUE(ProcessInController(wide_half_1));
     EXPECT_EQ(3, delegate->handle_switch_ime_count());
     EXPECT_TRUE(ProcessInController(wide_half_2));
     EXPECT_EQ(4, delegate->handle_switch_ime_count());
     EXPECT_TRUE(ProcessInController(hangul));
     EXPECT_EQ(5, delegate->handle_switch_ime_count());
   }
 
   // Test IME shortcuts that are triggered on key release.
   {
     const ui::Accelerator shift_alt_press(ui::VKEY_MENU,
                                           ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
     const ReleaseAccelerator shift_alt(ui::VKEY_MENU, ui::EF_SHIFT_DOWN);
     const ui::Accelerator alt_shift_press(ui::VKEY_SHIFT,
                                           ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
     const ReleaseAccelerator alt_shift(ui::VKEY_SHIFT, ui::EF_ALT_DOWN);
 
     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));
     EXPECT_EQ(1, delegate->handle_next_ime_count());
     EXPECT_FALSE(ProcessInController(alt_shift_press));
     EXPECT_TRUE(ProcessInController(alt_shift));
     EXPECT_EQ(2, delegate->handle_next_ime_count());
 
     // We should NOT switch IME when e.g. Shift+Alt+X is pressed and X is
     // released.
@@ skipping 87 matching lines @@
       ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
   EXPECT_FALSE(ProcessInController(shift_alt_space_press));
 }
 
 // Makes sure that the next IME accelerators doesn't conflict with other
 // accelerators that contain Alt+Shift when the wrong sequence is pressed.
 // crbug.com/527154.
 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.
   // Alt (press) + Shift (press) + S (press) + S (release) + Shift (release) +
   // Alt (release).
   generator.PressKey(ui::VKEY_MENU, ui::EF_ALT_DOWN);
   generator.PressKey(ui::VKEY_SHIFT, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
   generator.PressKey(ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
   generator.ReleaseKey(ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
   generator.ReleaseKey(ui::VKEY_SHIFT, ui::EF_ALT_DOWN);
@@ skipping 372 matching lines @@
     EXPECT_TRUE(IsMessageCenterEmpty());
 
     // If the action is LOCK_SCREEN, we must reset the state by unlocking the
     // screen before we proceed testing the rest of accelerators.
     ResetStateIfNeeded();
   }
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash