Regression: Search+Key pops up app launcher

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 229 matching lines @@
   ~AcceleratorControllerTest() override {}
 
  protected:
   void EnableInternalDisplay() {
     test::DisplayManagerTestApi(Shell::GetInstance()->display_manager()).
         SetFirstDisplayAsInternalDisplay();
   }
 
   static AcceleratorController* GetController();
 
+  static bool ProcessInControllerForTest(const ui::Accelerator& accelerator) {

[Jun Mukai, 2014/11/15 01:56:33]

You don't have to say 'ForTest', the entire file is already for test :)

[afakhry, 2014/11/15 02:40:31]

Done.

+    ui::AcceleratorHistory::GetInstance()->StoreCurrentAccelerator(accelerator);
+    return GetController()->Process(accelerator);
+  }
+
+  static ui::Accelerator GetPreviousAccelerator() {
+    return ui::AcceleratorHistory::GetInstance()->GetPreviousAccelerator();
+  }
+
+  static ui::Accelerator GetCurrentAccelerator() {
+    return ui::AcceleratorHistory::GetInstance()->GetCurrentAccelerator();
+  }
+
   // Several functions to access ExitWarningHandler (as friend).
   static void StubForTest(ExitWarningHandler* ewh) {
     ewh->stub_timer_for_test_ = true;
   }
   static void Reset(ExitWarningHandler* ewh) {
     ewh->state_ = ExitWarningHandler::IDLE;
   }
   static void SimulateTimerExpired(ExitWarningHandler* ewh) {
     ewh->TimerAction();
   }
@@ skipping 32 matching lines @@
 // Double press of exit shortcut => exiting
 TEST_F(AcceleratorControllerTest, ExitWarningHandlerTestDoublePress) {
   ui::Accelerator press(ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
   ui::Accelerator release(press);
   release.set_type(ui::ET_KEY_RELEASED);
   ExitWarningHandler* ewh = GetController()->GetExitWarningHandlerForTest();
   ASSERT_TRUE(!!ewh);
   StubForTest(ewh);
   EXPECT_TRUE(is_idle(ewh));
   EXPECT_FALSE(is_ui_shown(ewh));
-  EXPECT_TRUE(GetController()->Process(press));
-  EXPECT_FALSE(GetController()->Process(release));
+  EXPECT_TRUE(ProcessInControllerForTest(press));
+  EXPECT_FALSE(ProcessInControllerForTest(release));
   EXPECT_FALSE(is_idle(ewh));
   EXPECT_TRUE(is_ui_shown(ewh));
-  EXPECT_TRUE(GetController()->Process(press));  // second press before timer.
-  EXPECT_FALSE(GetController()->Process(release));
+  EXPECT_TRUE(ProcessInControllerForTest(press));  // second press before timer.
+  EXPECT_FALSE(ProcessInControllerForTest(release));
   SimulateTimerExpired(ewh);
   EXPECT_TRUE(is_exiting(ewh));
   EXPECT_FALSE(is_ui_shown(ewh));
   Reset(ewh);
 }
 
 // Single press of exit shortcut before timer => idle
 TEST_F(AcceleratorControllerTest, ExitWarningHandlerTestSinglePress) {
   ui::Accelerator press(ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
   ui::Accelerator release(press);
   release.set_type(ui::ET_KEY_RELEASED);
   ExitWarningHandler* ewh = GetController()->GetExitWarningHandlerForTest();
   ASSERT_TRUE(!!ewh);
   StubForTest(ewh);
   EXPECT_TRUE(is_idle(ewh));
   EXPECT_FALSE(is_ui_shown(ewh));
-  EXPECT_TRUE(GetController()->Process(press));
-  EXPECT_FALSE(GetController()->Process(release));
+  EXPECT_TRUE(ProcessInControllerForTest(press));
+  EXPECT_FALSE(ProcessInControllerForTest(release));
   EXPECT_FALSE(is_idle(ewh));
   EXPECT_TRUE(is_ui_shown(ewh));
   SimulateTimerExpired(ewh);
   EXPECT_TRUE(is_idle(ewh));
   EXPECT_FALSE(is_ui_shown(ewh));
   Reset(ewh);
 }
 
 // Shutdown ash with exit warning bubble open should not crash.
 TEST_F(AcceleratorControllerTest, LingeringExitWarningBubble) {
   ExitWarningHandler* ewh = GetController()->GetExitWarningHandlerForTest();
   ASSERT_TRUE(!!ewh);
   StubForTest(ewh);
 
   // Trigger once to show the bubble.
   ewh->HandleAccelerator();
   EXPECT_FALSE(is_idle(ewh));
   EXPECT_TRUE(is_ui_shown(ewh));
 
   // Exit ash and there should be no crash
 }
 #endif  // !defined(OS_WIN)
 
 TEST_F(AcceleratorControllerTest, Register) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target;
   GetController()->Register(accelerator_a, &target);
 
   // The registered accelerator is processed.
-  EXPECT_TRUE(GetController()->Process(accelerator_a));
+  EXPECT_TRUE(ProcessInControllerForTest(accelerator_a));
   EXPECT_EQ(1, target.accelerator_pressed_count());
 }
 
 TEST_F(AcceleratorControllerTest, RegisterMultipleTarget) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target1;
   GetController()->Register(accelerator_a, &target1);
   TestTarget target2;
   GetController()->Register(accelerator_a, &target2);
 
   // If multiple targets are registered with the same accelerator, the target
   // registered later processes the accelerator.
-  EXPECT_TRUE(GetController()->Process(accelerator_a));
+  EXPECT_TRUE(ProcessInControllerForTest(accelerator_a));
   EXPECT_EQ(0, target1.accelerator_pressed_count());
   EXPECT_EQ(1, target2.accelerator_pressed_count());
 }
 
 TEST_F(AcceleratorControllerTest, Unregister) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target;
   GetController()->Register(accelerator_a, &target);
   const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
   GetController()->Register(accelerator_b, &target);
 
   // Unregistering a different accelerator does not affect the other
   // accelerator.
   GetController()->Unregister(accelerator_b, &target);
-  EXPECT_TRUE(GetController()->Process(accelerator_a));
+  EXPECT_TRUE(ProcessInControllerForTest(accelerator_a));
   EXPECT_EQ(1, target.accelerator_pressed_count());
 
   // The unregistered accelerator is no longer processed.
   target.reset();
   GetController()->Unregister(accelerator_a, &target);
-  EXPECT_FALSE(GetController()->Process(accelerator_a));
+  EXPECT_FALSE(ProcessInControllerForTest(accelerator_a));
   EXPECT_EQ(0, target.accelerator_pressed_count());
 }
 
 TEST_F(AcceleratorControllerTest, UnregisterAll) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target1;
   GetController()->Register(accelerator_a, &target1);
   const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
   GetController()->Register(accelerator_b, &target1);
   const ui::Accelerator accelerator_c(ui::VKEY_C, ui::EF_NONE);
   TestTarget target2;
   GetController()->Register(accelerator_c, &target2);
   GetController()->UnregisterAll(&target1);
 
   // All the accelerators registered for |target1| are no longer processed.
-  EXPECT_FALSE(GetController()->Process(accelerator_a));
-  EXPECT_FALSE(GetController()->Process(accelerator_b));
+  EXPECT_FALSE(ProcessInControllerForTest(accelerator_a));
+  EXPECT_FALSE(ProcessInControllerForTest(accelerator_b));
   EXPECT_EQ(0, target1.accelerator_pressed_count());
 
   // UnregisterAll with a different target does not affect the other target.
-  EXPECT_TRUE(GetController()->Process(accelerator_c));
+  EXPECT_TRUE(ProcessInControllerForTest(accelerator_c));
   EXPECT_EQ(1, target2.accelerator_pressed_count());
 }
 
 TEST_F(AcceleratorControllerTest, Process) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target1;
   GetController()->Register(accelerator_a, &target1);
 
   // The registered accelerator is processed.
-  EXPECT_TRUE(GetController()->Process(accelerator_a));
+  EXPECT_TRUE(ProcessInControllerForTest(accelerator_a));
   EXPECT_EQ(1, target1.accelerator_pressed_count());
 
   // The non-registered accelerator is not processed.
   const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
-  EXPECT_FALSE(GetController()->Process(accelerator_b));
+  EXPECT_FALSE(ProcessInControllerForTest(accelerator_b));
 }
 
 TEST_F(AcceleratorControllerTest, IsRegistered) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   const ui::Accelerator accelerator_shift_a(ui::VKEY_A, ui::EF_SHIFT_DOWN);
   TestTarget target;
   GetController()->Register(accelerator_a, &target);
   EXPECT_TRUE(GetController()->IsRegistered(accelerator_a));
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_shift_a));
   GetController()->UnregisterAll(&target);
@@ skipping 281 matching lines @@
   EXPECT_EQ(4, target_a.accelerator_pressed_count());
   EXPECT_EQ(4, target_a.accelerator_repeat_count());
 }
 
 TEST_F(AcceleratorControllerTest, Previous) {
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.PressKey(ui::VKEY_VOLUME_MUTE, ui::EF_NONE);
   generator.ReleaseKey(ui::VKEY_VOLUME_MUTE, ui::EF_NONE);
 
   EXPECT_EQ(ui::VKEY_VOLUME_MUTE,
-            GetController()->previous_accelerator_for_test().key_code());
+            GetPreviousAccelerator().key_code());
   EXPECT_EQ(ui::EF_NONE,
-            GetController()->previous_accelerator_for_test().modifiers());
+            GetPreviousAccelerator().modifiers());
 
   generator.PressKey(ui::VKEY_TAB, ui::EF_CONTROL_DOWN);
   generator.ReleaseKey(ui::VKEY_TAB, ui::EF_CONTROL_DOWN);
 
   EXPECT_EQ(ui::VKEY_TAB,
-            GetController()->previous_accelerator_for_test().key_code());
+            GetPreviousAccelerator().key_code());
   EXPECT_EQ(ui::EF_CONTROL_DOWN,
-            GetController()->previous_accelerator_for_test().modifiers());
+            GetPreviousAccelerator().modifiers());
 }
 
 TEST_F(AcceleratorControllerTest, DontRepeatToggleFullscreen) {
   const AcceleratorData accelerators[] = {
       {true, ui::VKEY_J, ui::EF_ALT_DOWN, TOGGLE_FULLSCREEN},
       {true, ui::VKEY_K, ui::EF_ALT_DOWN, TOGGLE_FULLSCREEN},
   };
   GetController()->RegisterAccelerators(accelerators, arraysize(accelerators));
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
@@ skipping 74 matching lines @@
   key_event3.SetTranslated(true);
   details = dispatcher->OnEventFromSource(&key_event3);
   EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed);
 #endif
   EXPECT_EQ(1, target.accelerator_pressed_count());
 }
 #endif
 
 TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
   // CycleBackward
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN)));
   // CycleForward
   EXPECT_TRUE(
-      GetController()->Process(ui::Accelerator(ui::VKEY_TAB, ui::EF_ALT_DOWN)));
+      ProcessInControllerForTest(ui::Accelerator(
+          ui::VKEY_TAB, ui::EF_ALT_DOWN)));
   // CycleLinear
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE)));
 
 #if defined(OS_CHROMEOS)
   // Take screenshot / partial screenshot
   // True should always be returned regardless of the existence of the delegate.
   {
     test::TestScreenshotDelegate* delegate = GetScreenshotDelegate();
     delegate->set_can_take_screenshot(false);
-    EXPECT_TRUE(GetController()->Process(
+    EXPECT_TRUE(ProcessInControllerForTest(
         ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN)));
     EXPECT_TRUE(
-        GetController()->Process(ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
-    EXPECT_TRUE(GetController()->Process(ui::Accelerator(
+        ProcessInControllerForTest(ui::Accelerator(
+            ui::VKEY_PRINT, ui::EF_NONE)));
+    EXPECT_TRUE(ProcessInControllerForTest(ui::Accelerator(
         ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
 
     delegate->set_can_take_screenshot(true);
     EXPECT_EQ(0, delegate->handle_take_screenshot_count());
-    EXPECT_TRUE(GetController()->Process(
+    EXPECT_TRUE(ProcessInControllerForTest(
         ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN)));
     EXPECT_EQ(1, delegate->handle_take_screenshot_count());
     EXPECT_TRUE(
-        GetController()->Process(ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
+        ProcessInControllerForTest(ui::Accelerator(
+            ui::VKEY_PRINT, ui::EF_NONE)));
     EXPECT_EQ(2, delegate->handle_take_screenshot_count());
-    EXPECT_TRUE(GetController()->Process(ui::Accelerator(
+    EXPECT_TRUE(ProcessInControllerForTest(ui::Accelerator(
         ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
     EXPECT_EQ(2, delegate->handle_take_screenshot_count());
   }
 #endif
   const ui::Accelerator volume_mute(ui::VKEY_VOLUME_MUTE, ui::EF_NONE);
   const ui::Accelerator volume_down(ui::VKEY_VOLUME_DOWN, ui::EF_NONE);
   const ui::Accelerator volume_up(ui::VKEY_VOLUME_UP, ui::EF_NONE);
   {
     TestVolumeControlDelegate* delegate =
         new TestVolumeControlDelegate(false);
     ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
         scoped_ptr<VolumeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_volume_mute_count());
-    EXPECT_FALSE(GetController()->Process(volume_mute));
+    EXPECT_FALSE(ProcessInControllerForTest(volume_mute));
     EXPECT_EQ(1, delegate->handle_volume_mute_count());
     EXPECT_EQ(volume_mute, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
-    EXPECT_FALSE(GetController()->Process(volume_down));
+    EXPECT_FALSE(ProcessInControllerForTest(volume_down));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
-    EXPECT_FALSE(GetController()->Process(volume_up));
+    EXPECT_FALSE(ProcessInControllerForTest(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
   {
     TestVolumeControlDelegate* delegate = new TestVolumeControlDelegate(true);
     ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
         scoped_ptr<VolumeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_volume_mute_count());
-    EXPECT_TRUE(GetController()->Process(volume_mute));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_mute));
     EXPECT_EQ(1, delegate->handle_volume_mute_count());
     EXPECT_EQ(volume_mute, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
-    EXPECT_TRUE(GetController()->Process(volume_down));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_down));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
-    EXPECT_TRUE(GetController()->Process(volume_up));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
 #if defined(OS_CHROMEOS)
   // Brightness
   // ui::VKEY_BRIGHTNESS_DOWN/UP are not defined on Windows.
   const ui::Accelerator brightness_down(ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE);
   const ui::Accelerator brightness_up(ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE);
   {
     DummyBrightnessControlDelegate* delegate =
         new DummyBrightnessControlDelegate(false);
     GetController()->SetBrightnessControlDelegate(
         scoped_ptr<BrightnessControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_brightness_down_count());
-    EXPECT_FALSE(GetController()->Process(brightness_down));
+    EXPECT_FALSE(ProcessInControllerForTest(brightness_down));
     EXPECT_EQ(1, delegate->handle_brightness_down_count());
     EXPECT_EQ(brightness_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_brightness_up_count());
-    EXPECT_FALSE(GetController()->Process(brightness_up));
+    EXPECT_FALSE(ProcessInControllerForTest(brightness_up));
     EXPECT_EQ(1, delegate->handle_brightness_up_count());
     EXPECT_EQ(brightness_up, delegate->last_accelerator());
   }
   {
     DummyBrightnessControlDelegate* delegate =
         new DummyBrightnessControlDelegate(true);
     GetController()->SetBrightnessControlDelegate(
         scoped_ptr<BrightnessControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_brightness_down_count());
-    EXPECT_TRUE(GetController()->Process(brightness_down));
+    EXPECT_TRUE(ProcessInControllerForTest(brightness_down));
     EXPECT_EQ(1, delegate->handle_brightness_down_count());
     EXPECT_EQ(brightness_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_brightness_up_count());
-    EXPECT_TRUE(GetController()->Process(brightness_up));
+    EXPECT_TRUE(ProcessInControllerForTest(brightness_up));
     EXPECT_EQ(1, delegate->handle_brightness_up_count());
     EXPECT_EQ(brightness_up, delegate->last_accelerator());
   }
 
   // Keyboard brightness
   const ui::Accelerator alt_brightness_down(ui::VKEY_BRIGHTNESS_DOWN,
                                             ui::EF_ALT_DOWN);
   const ui::Accelerator alt_brightness_up(ui::VKEY_BRIGHTNESS_UP,
                                           ui::EF_ALT_DOWN);
   {
-    EXPECT_TRUE(GetController()->Process(alt_brightness_down));
-    EXPECT_TRUE(GetController()->Process(alt_brightness_up));
+    EXPECT_TRUE(ProcessInControllerForTest(alt_brightness_down));
+    EXPECT_TRUE(ProcessInControllerForTest(alt_brightness_up));
     DummyKeyboardBrightnessControlDelegate* delegate =
         new DummyKeyboardBrightnessControlDelegate(false);
     GetController()->SetKeyboardBrightnessControlDelegate(
         scoped_ptr<KeyboardBrightnessControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_keyboard_brightness_down_count());
-    EXPECT_FALSE(GetController()->Process(alt_brightness_down));
+    EXPECT_FALSE(ProcessInControllerForTest(alt_brightness_down));
     EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count());
     EXPECT_EQ(alt_brightness_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_keyboard_brightness_up_count());
-    EXPECT_FALSE(GetController()->Process(alt_brightness_up));
+    EXPECT_FALSE(ProcessInControllerForTest(alt_brightness_up));
     EXPECT_EQ(1, delegate->handle_keyboard_brightness_up_count());
     EXPECT_EQ(alt_brightness_up, delegate->last_accelerator());
   }
   {
     DummyKeyboardBrightnessControlDelegate* delegate =
         new DummyKeyboardBrightnessControlDelegate(true);
     GetController()->SetKeyboardBrightnessControlDelegate(
         scoped_ptr<KeyboardBrightnessControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_keyboard_brightness_down_count());
-    EXPECT_TRUE(GetController()->Process(alt_brightness_down));
+    EXPECT_TRUE(ProcessInControllerForTest(alt_brightness_down));
     EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count());
     EXPECT_EQ(alt_brightness_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_keyboard_brightness_up_count());
-    EXPECT_TRUE(GetController()->Process(alt_brightness_up));
+    EXPECT_TRUE(ProcessInControllerForTest(alt_brightness_up));
     EXPECT_EQ(1, delegate->handle_keyboard_brightness_up_count());
     EXPECT_EQ(alt_brightness_up, delegate->last_accelerator());
   }
 #endif
 
 #if !defined(OS_WIN)
   // Exit
   ExitWarningHandler* ewh = GetController()->GetExitWarningHandlerForTest();
   ASSERT_TRUE(!!ewh);
   StubForTest(ewh);
   EXPECT_TRUE(is_idle(ewh));
   EXPECT_FALSE(is_ui_shown(ewh));
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
   EXPECT_FALSE(is_idle(ewh));
   EXPECT_TRUE(is_ui_shown(ewh));
   SimulateTimerExpired(ewh);
   EXPECT_TRUE(is_idle(ewh));
   EXPECT_FALSE(is_ui_shown(ewh));
   Reset(ewh);
 #endif
 
   // New tab
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_T, ui::EF_CONTROL_DOWN)));
 
   // New incognito window
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
 
   // New window
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_N, ui::EF_CONTROL_DOWN)));
 
   // Restore tab
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
 
   // Show task manager
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN)));
 
 #if defined(OS_CHROMEOS)
   // Open file manager
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN)));
 
   // Lock screen
   // NOTE: Accelerators that do not work on the lock screen need to be
   // tested before the sequence below is invoked because it causes a side
   // effect of locking the screen.
-  EXPECT_TRUE(GetController()->Process(
+  EXPECT_TRUE(ProcessInControllerForTest(
       ui::Accelerator(ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
 #endif
 }
 
 TEST_F(AcceleratorControllerTest, GlobalAcceleratorsToggleAppList) {
   AccessibilityDelegate* delegate =
           ash::Shell::GetInstance()->accessibility_delegate();
   EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
 
   // The press event should not open the AppList, the release should instead.
   EXPECT_FALSE(
-      GetController()->Process(ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+      ProcessInControllerForTest(ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
   EXPECT_EQ(ui::VKEY_LWIN,
-            GetController()->previous_accelerator_for_test().key_code());
+            GetCurrentAccelerator().key_code());

[Jun Mukai, 2014/11/15 01:56:33]

Can you add
EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); here ?

[afakhry, 2014/11/15 02:40:31]

Done.

 
   EXPECT_TRUE(
-      GetController()->Process(ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+      ProcessInControllerForTest(ReleaseAccelerator(
+          ui::VKEY_LWIN, ui::EF_NONE)));
   EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
 
+  EXPECT_EQ(ui::VKEY_LWIN,
+            GetPreviousAccelerator().key_code());
+
   // When spoken feedback is on, the AppList should not toggle.
   delegate->ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_NONE);
   EXPECT_FALSE(
-      GetController()->Process(ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+      ProcessInControllerForTest(ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
   EXPECT_FALSE(
-      GetController()->Process(ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+      ProcessInControllerForTest(ReleaseAccelerator(
+          ui::VKEY_LWIN, ui::EF_NONE)));
   delegate->ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
 
   EXPECT_FALSE(
-      GetController()->Process(ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+      ProcessInControllerForTest(ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
   EXPECT_TRUE(
-      GetController()->Process(ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+      ProcessInControllerForTest(ReleaseAccelerator(
+          ui::VKEY_LWIN, ui::EF_NONE)));
   EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
 
   // When spoken feedback is on, the AppList should not toggle.
   delegate->ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_NONE);
   EXPECT_FALSE(
-      GetController()->Process(ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+      ProcessInControllerForTest(ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
   EXPECT_FALSE(
-      GetController()->Process(ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+      ProcessInControllerForTest(ReleaseAccelerator(
+          ui::VKEY_LWIN, ui::EF_NONE)));
   delegate->ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_NONE);
   EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
 }
 
 TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
   // Test IME shortcuts.
   {
     const ui::Accelerator control_space(ui::VKEY_SPACE, ui::EF_CONTROL_DOWN);
     const ui::Accelerator convert(ui::VKEY_CONVERT, ui::EF_NONE);
     const ui::Accelerator non_convert(ui::VKEY_NONCONVERT, ui::EF_NONE);
     const ui::Accelerator wide_half_1(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE);
     const ui::Accelerator wide_half_2(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE);
     const ui::Accelerator hangul(ui::VKEY_HANGUL, ui::EF_NONE);
-    EXPECT_FALSE(GetController()->Process(control_space));
-    EXPECT_FALSE(GetController()->Process(convert));
-    EXPECT_FALSE(GetController()->Process(non_convert));
-    EXPECT_FALSE(GetController()->Process(wide_half_1));
-    EXPECT_FALSE(GetController()->Process(wide_half_2));
-    EXPECT_FALSE(GetController()->Process(hangul));
+    EXPECT_FALSE(ProcessInControllerForTest(control_space));
+    EXPECT_FALSE(ProcessInControllerForTest(convert));
+    EXPECT_FALSE(ProcessInControllerForTest(non_convert));
+    EXPECT_FALSE(ProcessInControllerForTest(wide_half_1));
+    EXPECT_FALSE(ProcessInControllerForTest(wide_half_2));
+    EXPECT_FALSE(ProcessInControllerForTest(hangul));
     DummyImeControlDelegate* delegate = new DummyImeControlDelegate(true);
     GetController()->SetImeControlDelegate(
         scoped_ptr<ImeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_previous_ime_count());
-    EXPECT_TRUE(GetController()->Process(control_space));
+    EXPECT_TRUE(ProcessInControllerForTest(control_space));
     EXPECT_EQ(1, delegate->handle_previous_ime_count());
     EXPECT_EQ(0, delegate->handle_switch_ime_count());
-    EXPECT_TRUE(GetController()->Process(convert));
+    EXPECT_TRUE(ProcessInControllerForTest(convert));
     EXPECT_EQ(1, delegate->handle_switch_ime_count());
-    EXPECT_TRUE(GetController()->Process(non_convert));
+    EXPECT_TRUE(ProcessInControllerForTest(non_convert));
     EXPECT_EQ(2, delegate->handle_switch_ime_count());
-    EXPECT_TRUE(GetController()->Process(wide_half_1));
+    EXPECT_TRUE(ProcessInControllerForTest(wide_half_1));
     EXPECT_EQ(3, delegate->handle_switch_ime_count());
-    EXPECT_TRUE(GetController()->Process(wide_half_2));
+    EXPECT_TRUE(ProcessInControllerForTest(wide_half_2));
     EXPECT_EQ(4, delegate->handle_switch_ime_count());
-    EXPECT_TRUE(GetController()->Process(hangul));
+    EXPECT_TRUE(ProcessInControllerForTest(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(true);
     GetController()->SetImeControlDelegate(
         scoped_ptr<ImeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_next_ime_count());
-    EXPECT_FALSE(GetController()->Process(shift_alt_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt));
     EXPECT_EQ(1, delegate->handle_next_ime_count());
-    EXPECT_FALSE(GetController()->Process(alt_shift_press));
-    EXPECT_FALSE(GetController()->Process(alt_shift));
+    EXPECT_FALSE(ProcessInControllerForTest(alt_shift_press));
+    EXPECT_FALSE(ProcessInControllerForTest(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.
     const ui::Accelerator shift_alt_x_press(
         ui::VKEY_X,
         ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
     const ReleaseAccelerator shift_alt_x(ui::VKEY_X,
                                          ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
 
-    EXPECT_FALSE(GetController()->Process(shift_alt_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt_x_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt_x));
-    EXPECT_FALSE(GetController()->Process(shift_alt));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_x_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_x));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt));
     EXPECT_EQ(2, delegate->handle_next_ime_count());
 
     // But we _should_ if X is either VKEY_RETURN or VKEY_SPACE.
     // TODO(nona|mazda): Remove this when crbug.com/139556 in a better way.
     const ui::Accelerator shift_alt_return_press(
         ui::VKEY_RETURN,
         ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
     const ReleaseAccelerator shift_alt_return(
         ui::VKEY_RETURN,
         ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
 
-    EXPECT_FALSE(GetController()->Process(shift_alt_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt_return_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt_return));
-    EXPECT_FALSE(GetController()->Process(shift_alt));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_return_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_return));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt));
     EXPECT_EQ(3, delegate->handle_next_ime_count());
 
     const ui::Accelerator shift_alt_space_press(
         ui::VKEY_SPACE,
         ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
     const ReleaseAccelerator shift_alt_space(
         ui::VKEY_SPACE,
         ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
 
-    EXPECT_FALSE(GetController()->Process(shift_alt_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt_space_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt_space));
-    EXPECT_FALSE(GetController()->Process(shift_alt));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_space_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_space));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt));
     EXPECT_EQ(4, delegate->handle_next_ime_count());
   }
 
 #if defined(OS_CHROMEOS)
   // Test IME shortcuts again with unnormalized accelerators (Chrome OS only).
   {
     const ui::Accelerator shift_alt_press(ui::VKEY_MENU, ui::EF_SHIFT_DOWN);
     const ReleaseAccelerator shift_alt(ui::VKEY_MENU, ui::EF_SHIFT_DOWN);
     const ui::Accelerator alt_shift_press(ui::VKEY_SHIFT, ui::EF_ALT_DOWN);
     const ReleaseAccelerator alt_shift(ui::VKEY_SHIFT, ui::EF_ALT_DOWN);
 
     DummyImeControlDelegate* delegate = new DummyImeControlDelegate(true);
     GetController()->SetImeControlDelegate(
         scoped_ptr<ImeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_next_ime_count());
-    EXPECT_FALSE(GetController()->Process(shift_alt_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt));
     EXPECT_EQ(1, delegate->handle_next_ime_count());
-    EXPECT_FALSE(GetController()->Process(alt_shift_press));
-    EXPECT_FALSE(GetController()->Process(alt_shift));
+    EXPECT_FALSE(ProcessInControllerForTest(alt_shift_press));
+    EXPECT_FALSE(ProcessInControllerForTest(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.
     const ui::Accelerator shift_alt_x_press(
         ui::VKEY_X,
         ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
     const ReleaseAccelerator shift_alt_x(ui::VKEY_X,
                                          ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
 
-    EXPECT_FALSE(GetController()->Process(shift_alt_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt_x_press));
-    EXPECT_FALSE(GetController()->Process(shift_alt_x));
-    EXPECT_FALSE(GetController()->Process(shift_alt));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_x_press));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt_x));
+    EXPECT_FALSE(ProcessInControllerForTest(shift_alt));
     EXPECT_EQ(2, delegate->handle_next_ime_count());
   }
 #endif
 }
 
 // TODO(nona|mazda): Remove this when crbug.com/139556 in a better way.
 TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsWorkaround139556) {
   // The workaround for crbug.com/139556 depends on the fact that we don't
   // use Shift+Alt+Enter/Space with ET_KEY_PRESSED as an accelerator. Test it.
   const ui::Accelerator shift_alt_return_press(
       ui::VKEY_RETURN,
       ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
-  EXPECT_FALSE(GetController()->Process(shift_alt_return_press));
+  EXPECT_FALSE(ProcessInControllerForTest(shift_alt_return_press));
   const ui::Accelerator shift_alt_space_press(
       ui::VKEY_SPACE,
       ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
-  EXPECT_FALSE(GetController()->Process(shift_alt_space_press));
+  EXPECT_FALSE(ProcessInControllerForTest(shift_alt_space_press));
 }
 
 TEST_F(AcceleratorControllerTest, PreferredReservedAccelerators) {
 #if defined(OS_CHROMEOS)
   // Power key is reserved on chromeos.
   EXPECT_TRUE(GetController()->IsReserved(
       ui::Accelerator(ui::VKEY_POWER, ui::EF_NONE)));
   EXPECT_FALSE(GetController()->IsPreferred(
       ui::Accelerator(ui::VKEY_POWER, ui::EF_NONE)));
 #endif
@@ skipping 118 matching lines @@
           << " for action (disallowed at modal window): " << *it;
     }
   }
   //  Testing of top row (F5-F10) accelerators that should still work
   //  when a modal window is open
   //
   // Screenshot
   {
     test::TestScreenshotDelegate* delegate = GetScreenshotDelegate();
     delegate->set_can_take_screenshot(false);
-    EXPECT_TRUE(GetController()->Process(
+    EXPECT_TRUE(ProcessInControllerForTest(
         ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN)));
     EXPECT_TRUE(
-        GetController()->Process(ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
-    EXPECT_TRUE(GetController()->Process(ui::Accelerator(
+        ProcessInControllerForTest(ui::Accelerator(
+            ui::VKEY_PRINT, ui::EF_NONE)));
+    EXPECT_TRUE(ProcessInControllerForTest(ui::Accelerator(
         ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
     delegate->set_can_take_screenshot(true);
     EXPECT_EQ(0, delegate->handle_take_screenshot_count());
-    EXPECT_TRUE(GetController()->Process(
+    EXPECT_TRUE(ProcessInControllerForTest(
         ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN)));
     EXPECT_EQ(1, delegate->handle_take_screenshot_count());
     EXPECT_TRUE(
-        GetController()->Process(ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
+        ProcessInControllerForTest(ui::Accelerator(
+            ui::VKEY_PRINT, ui::EF_NONE)));
     EXPECT_EQ(2, delegate->handle_take_screenshot_count());
-    EXPECT_TRUE(GetController()->Process(ui::Accelerator(
+    EXPECT_TRUE(ProcessInControllerForTest(ui::Accelerator(
         ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
     EXPECT_EQ(2, delegate->handle_take_screenshot_count());
   }
   // Brightness
   const ui::Accelerator brightness_down(ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE);
   const ui::Accelerator brightness_up(ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE);
   {
     DummyBrightnessControlDelegate* delegate =
         new DummyBrightnessControlDelegate(false);
     GetController()->SetBrightnessControlDelegate(
         scoped_ptr<BrightnessControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_brightness_down_count());
-    EXPECT_FALSE(GetController()->Process(brightness_down));
+    EXPECT_FALSE(ProcessInControllerForTest(brightness_down));
     EXPECT_EQ(1, delegate->handle_brightness_down_count());
     EXPECT_EQ(brightness_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_brightness_up_count());
-    EXPECT_FALSE(GetController()->Process(brightness_up));
+    EXPECT_FALSE(ProcessInControllerForTest(brightness_up));
     EXPECT_EQ(1, delegate->handle_brightness_up_count());
     EXPECT_EQ(brightness_up, delegate->last_accelerator());
   }
   {
     DummyBrightnessControlDelegate* delegate =
         new DummyBrightnessControlDelegate(true);
     GetController()->SetBrightnessControlDelegate(
         scoped_ptr<BrightnessControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_brightness_down_count());
-    EXPECT_TRUE(GetController()->Process(brightness_down));
+    EXPECT_TRUE(ProcessInControllerForTest(brightness_down));
     EXPECT_EQ(1, delegate->handle_brightness_down_count());
     EXPECT_EQ(brightness_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_brightness_up_count());
-    EXPECT_TRUE(GetController()->Process(brightness_up));
+    EXPECT_TRUE(ProcessInControllerForTest(brightness_up));
     EXPECT_EQ(1, delegate->handle_brightness_up_count());
     EXPECT_EQ(brightness_up, delegate->last_accelerator());
   }
   // Volume
   const ui::Accelerator volume_mute(ui::VKEY_VOLUME_MUTE, ui::EF_NONE);
   const ui::Accelerator volume_down(ui::VKEY_VOLUME_DOWN, ui::EF_NONE);
   const ui::Accelerator volume_up(ui::VKEY_VOLUME_UP, ui::EF_NONE);
   {
-    EXPECT_TRUE(GetController()->Process(volume_mute));
-    EXPECT_TRUE(GetController()->Process(volume_down));
-    EXPECT_TRUE(GetController()->Process(volume_up));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_mute));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_down));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_up));
     TestVolumeControlDelegate* delegate =
         new TestVolumeControlDelegate(false);
     ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
         scoped_ptr<VolumeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_volume_mute_count());
-    EXPECT_FALSE(GetController()->Process(volume_mute));
+    EXPECT_FALSE(ProcessInControllerForTest(volume_mute));
     EXPECT_EQ(1, delegate->handle_volume_mute_count());
     EXPECT_EQ(volume_mute, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
-    EXPECT_FALSE(GetController()->Process(volume_down));
+    EXPECT_FALSE(ProcessInControllerForTest(volume_down));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
-    EXPECT_FALSE(GetController()->Process(volume_up));
+    EXPECT_FALSE(ProcessInControllerForTest(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
   {
     TestVolumeControlDelegate* delegate = new TestVolumeControlDelegate(true);
     ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
         scoped_ptr<VolumeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_volume_mute_count());
-    EXPECT_TRUE(GetController()->Process(volume_mute));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_mute));
     EXPECT_EQ(1, delegate->handle_volume_mute_count());
     EXPECT_EQ(volume_mute, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
-    EXPECT_TRUE(GetController()->Process(volume_down));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_down));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
-    EXPECT_TRUE(GetController()->Process(volume_up));
+    EXPECT_TRUE(ProcessInControllerForTest(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
 }
 #endif
 
 TEST_F(AcceleratorControllerTest, DisallowedWithNoWindow) {
   const ui::Accelerator dummy;
   AccessibilityDelegate* delegate =
       ash::Shell::GetInstance()->accessibility_delegate();
@@ skipping 23 matching lines @@
     wm::ActivateWindow(window.get());
     GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
     delegate->TriggerAccessibilityAlert(ui::A11Y_ALERT_NONE);
     GetController()->PerformAction(kActionsNeedingWindow[i], dummy);
     EXPECT_NE(delegate->GetLastAccessibilityAlert(),
               ui::A11Y_ALERT_WINDOW_NEEDED);
   }
 }
 
 }  // namespace ash