Disable the deprecated Alt+Shift for NEXT_IME

ash/accelerators/accelerator_controller_unittest.cc

Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 1f279bf0a2f7cb0889b7d2a5c9d415b4705387a9..bcbe4d73bd2d61180943848ed9936096563cfbfb 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -1036,7 +1036,7 @@ TEST_F(AcceleratorControllerTest, GlobalAcceleratorsToggleAppList) {
 TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
   // Test IME shortcuts.
   {
-     ui::Accelerator control_space_down(ui::VKEY_SPACE, ui::EF_CONTROL_DOWN);
+    ui::Accelerator control_space_down(ui::VKEY_SPACE, ui::EF_CONTROL_DOWN);
     control_space_down.set_type(ui::ET_KEY_PRESSED);
     ui::Accelerator control_space_up(ui::VKEY_SPACE, ui::EF_CONTROL_DOWN);
     control_space_up.set_type(ui::ET_KEY_RELEASED);
@@ -1073,6 +1073,8 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
     EXPECT_EQ(5, delegate->handle_switch_ime_count());
   }
 
+  // The Old NEXT_IME accelerators have been disabled on ChromeOS.
+#if !defined(OS_CHROMEOS)
   // Test IME shortcuts that are triggered on key release.
   {
     const ui::Accelerator shift_alt_press(ui::VKEY_MENU,
@@ -1135,41 +1137,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
     EXPECT_TRUE(ProcessInController(shift_alt));
     EXPECT_EQ(5, 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;
-    GetController()->SetImeControlDelegate(
-        std::unique_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.
-    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(ProcessInController(shift_alt_press));
-    EXPECT_FALSE(ProcessInController(shift_alt_x_press));
-    EXPECT_FALSE(ProcessInController(shift_alt_x));
-    EXPECT_TRUE(ProcessInController(shift_alt));
-    EXPECT_EQ(3, delegate->handle_next_ime_count());
-  }
-#endif
+#endif  // defined(OS_CHROMEOS)
 }
 
 // TODO(nona|mazda): Remove this when crbug.com/139556 in a better way.
@@ -1186,6 +1154,8 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsWorkaround139556) {
   EXPECT_FALSE(ProcessInController(shift_alt_space_press));
 }
 
+// The Old NEXT_IME accelerators have been disabled on ChromeOS.
+#if !defined(OS_CHROMEOS)
 // 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.
@@ -1245,6 +1215,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsNoConflict) {
   generator.ReleaseKey(ui::VKEY_MENU, ui::EF_NONE);
   EXPECT_EQ(2, delegate->handle_next_ime_count());
 }
+#endif  // defined(OS_CHROMEOS)
 
 TEST_F(AcceleratorControllerTest, PreferredReservedAccelerators) {
 #if defined(OS_CHROMEOS)