diff options
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_apitest.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 781ae74..16d4942 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -10,8 +10,7 @@ #include "chrome/common/pref_names.h" // TODO(skerner): This test is flaky on chrome os: http://crbug.com/39843 -// TODO(skerner): Crash observed on linux as well: http://crbug.com/39746 -#if defined(OS_LINUX) +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) #define MAYBE_Tabs DISABLED_Tabs #else #define MAYBE_Tabs Tabs @@ -29,14 +28,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_; } -// chrome.tabs.captureVisibleTab fails on the 10.6 bots. -// http://crbug.com/37387 -#if defined(OS_MACOSX) -#define MAYBE_CaptureVisibleTab DISABLED_CaptureVisible -#else -#define MAYBE_CaptureVisibleTab CaptureVisibleTab -#endif -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTab) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) { StartHTTPServer(); ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_; |