Enable Search-key modifiers for extended key shortcuts.

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/caps_lock_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 872 matching lines @@
 
   // 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(ProcessWithContext(
       ui::Accelerator(ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
 #endif
 }
 
-TEST_F(AcceleratorControllerTest,
-       GlobalAcceleratorsToggleAppListWithoutSearchAsModifier) {
-  ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
-
-  EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
-
-  // When Search is not acting as a modifier, pressing Search should toggle
-  // the AppList
-  EXPECT_TRUE(ProcessWithContext(
-      ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
-  EXPECT_FALSE(ProcessWithContext(
-      ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
-  EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
-
-  // When spoken feedback is on, the AppList should not toggle.
-  delegate->ToggleSpokenFeedback(A11Y_NOTIFICATION_NONE);
-  EXPECT_FALSE(ProcessWithContext(
-      ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
-  EXPECT_FALSE(ProcessWithContext(
-      ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
-  delegate->ToggleSpokenFeedback(A11Y_NOTIFICATION_NONE);
-  EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
-
-  EXPECT_TRUE(ProcessWithContext(
-      ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
-  EXPECT_FALSE(ProcessWithContext(
-      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(A11Y_NOTIFICATION_NONE);
-  EXPECT_FALSE(ProcessWithContext(
-      ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
-  EXPECT_FALSE(ProcessWithContext(
-      ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
-  delegate->ToggleSpokenFeedback(A11Y_NOTIFICATION_NONE);
-  EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
-}
-
-TEST_F(AcceleratorControllerTest,
-       GlobalAcceleratorsToggleAppListWithSearchAsModifier) {
+TEST_F(AcceleratorControllerTest, GlobalAcceleratorsToggleAppList) {
   test::TestShellDelegate* delegate =
       reinterpret_cast<test::TestShellDelegate*>(
           ash::Shell::GetInstance()->delegate());
-  delegate->set_is_search_key_acting_as_function_key(true);
-
   EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
 
-  // When Search is acting as a modifier for accessing extended keyboard
-  // shortcuts, then the press event should not open the AppList, and the
-  // release should instead.
+  // The press event should not open the AppList, the release should instead.
   EXPECT_FALSE(ProcessWithContext(
       ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
   EXPECT_TRUE(ProcessWithContext(
       ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
   EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
 
   // When spoken feedback is on, the AppList should not toggle.
   delegate->ToggleSpokenFeedback(A11Y_NOTIFICATION_NONE);
   EXPECT_FALSE(ProcessWithContext(
       ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
@@ skipping 322 matching lines @@
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_TRUE(ProcessWithContext(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
 }
 #endif
 
 }  // namespace ash