| Index: chrome/browser/apps/guest_view/web_view_browsertest.cc
|
| diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
|
| index fbc1b1dbad58560a2a12a9ec40ad6b7321d2ae1c..2698c537659b3b751072125fd806c09a035325b5 100644
|
| --- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
|
| +++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
|
| @@ -95,12 +95,6 @@
|
| #include "content/public/test/ppapi_test_utils.h"
|
| #endif
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "ash/common/accessibility_types.h"
|
| -#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
|
| -#include "chrome/browser/chromeos/accessibility/speech_monitor.h"
|
| -#endif
|
| -
|
| using extensions::ContextMenuMatcher;
|
| using extensions::ExtensionsAPIClient;
|
| using extensions::MenuItem;
|
| @@ -2222,30 +2216,6 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, ScreenCoordinates) {
|
| << message_;
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -// Flaky, see http://crbug.com/611736.
|
| -IN_PROC_BROWSER_TEST_P(WebViewTest, DISABLED_ChromeVoxInjection) {
|
| - EXPECT_FALSE(
|
| - chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
| -
|
| - chromeos::SpeechMonitor monitor;
|
| - chromeos::AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| - EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage());
|
| -
|
| - ASSERT_TRUE(StartEmbeddedTestServer());
|
| - content::WebContents* guest_web_contents = LoadGuest(
|
| - "/extensions/platform_apps/web_view/chromevox_injection/guest.html",
|
| - "web_view/chromevox_injection");
|
| - ASSERT_TRUE(guest_web_contents);
|
| -
|
| - for (;;) {
|
| - if (monitor.GetNextUtterance() == "chrome vox test title")
|
| - break;
|
| - }
|
| -}
|
| -#endif
|
| -
|
| // Flaky on Windows. http://crbug.com/303966
|
| #if defined(OS_WIN)
|
| #define MAYBE_TearDownTest DISABLED_TearDownTest
|
|
|