summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation/automation_proxy_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/automation/automation_proxy_uitest.cc')
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index d4a7d76..0f6ae6b 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -979,6 +979,10 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy) {
EXPECT_EQ(text_to_set2, actual_text2);
}
+#endif // defined(OS_WIN) || defined(OS_LINUX)
+
+// Not run on linux because of flakiness. http://crbug.com/19876
+#if defined(OS_WIN)
TEST_F(AutomationProxyVisibleTest, AutocompleteMatchesTest) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
@@ -996,7 +1000,7 @@ TEST_F(AutomationProxyVisibleTest, AutocompleteMatchesTest) {
EXPECT_TRUE(edit->GetAutocompleteMatches(&matches));
EXPECT_FALSE(matches.empty());
}
-#endif // defined(OS_WIN) || defined(OS_LINUX)
+#endif // defined(OS_WIN)
// Disabled because flaky see bug #5314.
TEST_F(AutomationProxyTest, DISABLED_AppModalDialogTest) {