Chromium Code Reviews| Index: chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc |
| diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc |
| index 56108d61276fd99d5d1131adaa82ca438a874c6d..0a5a445d07611b9fda2963039b4e2eb59c1ababc 100644 |
| --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc |
| +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc |
| @@ -10,6 +10,7 @@ |
| #include "base/strings/string_util.h" |
| #include "chrome/app/chrome_command_ids.h" |
| #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| +#include "chrome/browser/chromeos/accessibility/accessibility_util.h" |
| #include "chrome/browser/chromeos/accessibility/speech_monitor.h" |
| #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
| @@ -67,19 +68,6 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest { |
| root_window, key, false, false, false, false)); |
| } |
| - void SimulateTouchScreenInChromeVox() { |
| - // ChromeVox looks at whether 'ontouchstart' exists to know whether |
| - // or not it should respond to hover events. Fake it so that touch |
| - // exploration events get spoken. |
| - extensions::ExtensionHost* host = |
| - extensions::ExtensionSystem::Get(browser()->profile())-> |
| - process_manager()->GetBackgroundHostForExtension( |
| - extension_misc::kChromeVoxExtensionId); |
| - CHECK(content::ExecuteScript( |
| - host->host_contents(), |
| - "window.ontouchstart = function() {};")); |
| - } |
| - |
| private: |
| StubBrailleController braille_controller_; |
| DISALLOW_COPY_AND_ASSIGN(LoggedInSpokenFeedbackTest); |
| @@ -232,7 +220,7 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, TouchExploreStatusTray) { |
| true, ash::A11Y_NOTIFICATION_NONE); |
| EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage()); |
| - SimulateTouchScreenInChromeVox(); |
| + accessibility::SimulateTouchScreenInChromeVoxForTest(browser()->profile()); |
| // Send an accessibility hover event on the system tray, which is |
| // what we get when you tap it on a touch screen when ChromeVox is on. |
| @@ -245,6 +233,8 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, TouchExploreStatusTray) { |
| EXPECT_EQ("button", monitor.GetNextUtterance()); |
| } |
| + |
|
James Cook
2014/08/08 17:06:32
nit: Only one blank line between these sections
evy
2014/08/08 18:37:47
Done.
|
| + |
| // |
| // Spoken feedback tests that run only in guest mode. |
| // |