Disable CaptureVisibleTabPng/Jpeg on platforms where they time out.

chrome/browser/extensions/extension_tabs_apitest.cc

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 6cf4801fdd3f5349e19bd662049a7e6888bdd338..c6c1693c668b5ba9db48ceb68daf5e66a4b7d442 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -97,8 +97,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) {
   ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_;
 }
 
-// Test is timing out on cros and flaky on others. See http://crbug.com/83876
-#if defined(OS_CHROMEOS)
+// Test is timing out on linux and cros and flaky on others.
+// See http://crbug.com/83876
+#if defined(OS_LINUX)

[msw, 2011/05/26 07:24:43]

If Jpeg is still timing out on cros, perhaps you should leave that disabled?

 #define MAYBE_CaptureVisibleTabJpeg DISABLED_CaptureVisibleTabJpeg
 #else
 #define MAYBE_CaptureVisibleTabJpeg FLAKY_CaptureVisibleTabJpeg
@@ -111,8 +112,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) {
                                   "test_jpeg.html")) << message_;
 }
 
-// Test is flaky. See http://crbug.com/83876
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_CaptureVisibleTabPng) {
+// Test is timing out on cros and flaky on others. See http://crbug.com/83876
+#if defined(OS_CHROMEOS)
+#define MAYBE_CaptureVisibleTabPng DISABLED_CaptureVisibleTabPng
+#else
+#define MAYBE_CaptureVisibleTabPng FLAKY_CaptureVisibleTabPng
+#endif
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabPng) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   host_resolver()->AddRule("b.com", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());