| Index: chrome/test/automation/automation_proxy_uitest.cc
|
| diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
|
| index 0f6ae6bb0c95bc5c47ed56d320c0edfe2758b7b5..2566bb86b69094db5f3d5aec208ee917db0a165b 100644
|
| --- a/chrome/test/automation/automation_proxy_uitest.cc
|
| +++ b/chrome/test/automation/automation_proxy_uitest.cc
|
| @@ -981,9 +981,8 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy) {
|
|
|
| #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) {
|
| +// So flaky, http://crbug.com/19876. Consult phajdan.jr before re-enabling.
|
| +TEST_F(AutomationProxyVisibleTest, DISABLED_AutocompleteMatchesTest) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| scoped_refptr<AutocompleteEditProxy> edit(
|
| @@ -1000,7 +999,6 @@ TEST_F(AutomationProxyVisibleTest, AutocompleteMatchesTest) {
|
| EXPECT_TRUE(edit->GetAutocompleteMatches(&matches));
|
| EXPECT_FALSE(matches.empty());
|
| }
|
| -#endif // defined(OS_WIN)
|
|
|
| // Disabled because flaky see bug #5314.
|
| TEST_F(AutomationProxyTest, DISABLED_AppModalDialogTest) {
|
|
|