Index: chrome/browser/extensions/extension_tabs_apitest.cc |
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc |
index c0cc2110f801ba2a522ec5f9ec782bbc97a8931d..6cf4801fdd3f5349e19bd662049a7e6888bdd338 100644 |
--- a/chrome/browser/extensions/extension_tabs_apitest.cc |
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc |
@@ -97,8 +97,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) { |
ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; |
} |
-// Test is flaky. See http://crbug.com/83876 |
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_CaptureVisibleTabJpeg) { |
+// Test is timing out on cros and flaky on others. See http://crbug.com/83876 |
+#if defined(OS_CHROMEOS) |
+#define MAYBE_CaptureVisibleTabJpeg DISABLED_CaptureVisibleTabJpeg |
+#else |
+#define MAYBE_CaptureVisibleTabJpeg FLAKY_CaptureVisibleTabJpeg |
+#endif |
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) { |
host_resolver()->AddRule("a.com", "127.0.0.1"); |
host_resolver()->AddRule("b.com", "127.0.0.1"); |
ASSERT_TRUE(StartTestServer()); |