Revert of Add test for ChromeVox keyboard commands. (patchset #7 id:120001 of...

Revert of Add test for ChromeVox keyboard commands. (patchset #7 id:120001 of https://codereview.chromium.org/490443002/)

Reason for revert:
Broke interactive_ui_tests on Linux ChromiumOS Ozone: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Ozone%20Tests%20%282%29/builds/1626/steps/interactive_ui_tests

Failing tests:
ChromeVoxNavigateAndSelect_0
ChromeVoxPrefixKey_0
ChromeVoxPrefixKey_1
ChromeVoxShiftSearch_0
ChromeVoxShiftSearch_1

Original issue's description:
> Add test for ChromeVox keyboard commands.
>
> This is just a couple of quick sanity checks to prevent future regressions
> like the one in the linked bug. It tests both a Search+Shift shortcut and
> the corresponding Prefix Key shortcut.
>
> Adds support for sending the meta modifier key in
> aura/x11 tests.
>
> BUG=404470
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=291547
>
> Committed: https://chromium.googlesource.com/chromium/src/+/8cab2737f1cb6e6011b0946f6bef5027868602c0

TBR=dtseng@chromium.org,sky@chromium.org,dmazzoni@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=404470

Review URL: https://codereview.chromium.org/535283004

Cr-Commit-Position: refs/heads/master@{#293251}

chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc

@@ -60,24 +60,11 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest {
   }
 
   void SendKeyPress(ui::KeyboardCode key) {
-    ASSERT_NO_FATAL_FAILURE(
-        ASSERT_TRUE(
-            ui_test_utils::SendKeyPressToWindowSync(
-                NULL, key, false, false, false, false)));
-  }
-
-  void SendKeyPressWithControl(ui::KeyboardCode key) {
-    ASSERT_NO_FATAL_FAILURE(
-        ASSERT_TRUE(
-            ui_test_utils::SendKeyPressToWindowSync(
-                NULL, key, true, false, false, false)));
-  }
-
-  void SendKeyPressWithSearchAndShift(ui::KeyboardCode key) {
-    ASSERT_NO_FATAL_FAILURE(
-        ASSERT_TRUE(
-            ui_test_utils::SendKeyPressToWindowSync(
-                NULL, key, false, true, false, true)));
+    gfx::NativeWindow root_window =
+        ash::Shell::GetInstance()->GetPrimaryRootWindow();
+    ASSERT_TRUE(
+        ui_test_utils::SendKeyPressToWindowSync(
+            root_window, key, false, false, false, false));
   }
 
   void RunJavaScriptInChromeVoxBackgroundPage(const std::string& script) {
@@ -251,93 +238,6 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, TypeInOmnibox) {
   EXPECT_EQ("z", monitor.GetNextUtterance());
 }
 
-IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, ChromeVoxShiftSearch) {
-  EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
-
-  SpeechMonitor monitor;
-  AccessibilityManager::Get()->EnableSpokenFeedback(
-      true, ash::A11Y_NOTIFICATION_NONE);
-  EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage());
-
-  ui_test_utils::NavigateToURL(
-      browser(),
-      GURL("data:text/html;charset=utf-8,<button autofocus>Click me</button>"));
-  while (true) {
-    std::string utterance = monitor.GetNextUtterance();
-    if (utterance == "Click me")
-      break;
-  }
-  EXPECT_EQ("Button", monitor.GetNextUtterance());
-
-  // Press Search+Shift+/ to enter ChromeVox's "find in page".
-  SendKeyPressWithSearchAndShift(ui::VKEY_OEM_2);
-  EXPECT_EQ("Find in page.", monitor.GetNextUtterance());
-  EXPECT_EQ("Enter a search query.", monitor.GetNextUtterance());
-}
-
-IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, ChromeVoxPrefixKey) {
-  EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
-
-  SpeechMonitor monitor;
-  AccessibilityManager::Get()->EnableSpokenFeedback(
-      true, ash::A11Y_NOTIFICATION_NONE);
-  EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage());
-
-  ui_test_utils::NavigateToURL(
-      browser(),
-      GURL("data:text/html;charset=utf-8,<button autofocus>Click me</button>"));
-  while (true) {
-    std::string utterance = monitor.GetNextUtterance();
-    if (utterance == "Click me")
-      break;
-  }
-  EXPECT_EQ("Button", monitor.GetNextUtterance());
-
-  // Press the prefix key Ctrl+';' followed by '/'
-  // to enter ChromeVox's "find in page".
-  SendKeyPressWithControl(ui::VKEY_OEM_1);
-  SendKeyPress(ui::VKEY_OEM_2);
-  EXPECT_EQ("Find in page.", monitor.GetNextUtterance());
-  EXPECT_EQ("Enter a search query.", monitor.GetNextUtterance());
-}
-
-IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, ChromeVoxNavigateAndSelect) {
-  EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
-
-  SpeechMonitor monitor;
-  AccessibilityManager::Get()->EnableSpokenFeedback(
-      true, ash::A11Y_NOTIFICATION_NONE);
-  EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage());
-
-  ui_test_utils::NavigateToURL(
-      browser(),
-      GURL("data:text/html;charset=utf-8,"
-           "<h1>Title</h1>"
-           "<button autofocus>Click me</button>"));
-  while (true) {
-    std::string utterance = monitor.GetNextUtterance();
-    if (utterance == "Click me")
-      break;
-  }
-  EXPECT_EQ("Button", monitor.GetNextUtterance());
-
-  // Press Search+Shift+Up to navigate to the previous item.
-  SendKeyPressWithSearchAndShift(ui::VKEY_UP);
-  EXPECT_EQ("Title", monitor.GetNextUtterance());
-  EXPECT_EQ("Heading 1", monitor.GetNextUtterance());
-
-  // Press Search+Shift+S to select the text.
-  SendKeyPressWithSearchAndShift(ui::VKEY_S);
-  EXPECT_EQ("Start selection", monitor.GetNextUtterance());
-  EXPECT_EQ("Title", monitor.GetNextUtterance());
-  EXPECT_EQ(", selected", monitor.GetNextUtterance());
-
-  // Press again to end the selection.
-  SendKeyPressWithSearchAndShift(ui::VKEY_S);
-  EXPECT_EQ("End selection", monitor.GetNextUtterance());
-  EXPECT_EQ("Title", monitor.GetNextUtterance());
-}
-
 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, TouchExploreStatusTray) {
   EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
 

ui/aura/test/ui_controls_factory_aurax11.cc

@@ -56,6 +56,7 @@ class UIControlsX11 : public UIControlsAura {
                             bool shift,
                             bool alt,
                             bool command) OVERRIDE {
+    DCHECK(!command);  // No command key on Aura
     return SendKeyPressNotifyWhenDone(
         window, key, control, shift, alt, command, base::Closure());
   }
@@ -67,6 +68,7 @@ class UIControlsX11 : public UIControlsAura {
       bool alt,
       bool command,
       const base::Closure& closure) OVERRIDE {
+    DCHECK(!command);  // No command key on Aura
     XEvent xevent = {0};
     xevent.xkey.type = KeyPress;
     if (control)
@@ -75,8 +77,6 @@ class UIControlsX11 : public UIControlsAura {
       SetKeycodeAndSendThenMask(&xevent, XK_Shift_L, ShiftMask);
     if (alt)
       SetKeycodeAndSendThenMask(&xevent, XK_Alt_L, Mod1Mask);
-    if (command)
-      SetKeycodeAndSendThenMask(&xevent, XK_Super_L, Mod4Mask);
     xevent.xkey.keycode =
         XKeysymToKeycode(gfx::GetXDisplay(),
                          ui::XKeysymForWindowsKeyCode(key, shift));
@@ -91,8 +91,6 @@ class UIControlsX11 : public UIControlsAura {
       UnmaskAndSetKeycodeThenSend(&xevent, ShiftMask, XK_Shift_L);
     if (control)
       UnmaskAndSetKeycodeThenSend(&xevent, ControlMask, XK_Control_L);
-    if (command)
-      UnmaskAndSetKeycodeThenSend(&xevent, Mod4Mask, XK_Super_L);
     DCHECK(!xevent.xkey.state);
     RunClosureAfterAllPendingUIEvents(closure);
     return true;

ui/aura/test/ui_controls_factory_ozone.cc

@@ -55,11 +55,6 @@ class UIControlsOzone : public ui_controls::UIControlsAura {
       PostKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_MENU, flags);
     }
 
-    if (command) {
-      flags |= ui::EF_COMMAND_DOWN;
-      PostKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_LWIN, flags);
-    }
-
     PostKeyEvent(ui::ET_KEY_PRESSED, key, flags);
     PostKeyEvent(ui::ET_KEY_RELEASED, key, flags);
 
@@ -78,11 +73,6 @@ class UIControlsOzone : public ui_controls::UIControlsAura {
       PostKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, flags);
     }
 
-    if (command) {
-      flags &= ~ui::EF_COMMAND_DOWN;
-      PostKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_LWIN, flags);
-    }
-
     RunClosureAfterAllPendingUIEvents(closure);
     return true;
   }