diff options
| author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 22:23:17 +0000 |
|---|---|---|
| committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 22:23:17 +0000 |
| commit | 9cc92df2e18c1a62e037decf5326e32fecc96b35 (patch) | |
| tree | b464605555755d996239bfd78864ddfd5b0dc4fc /chrome/browser/extensions | |
| parent | d45bfd3f14ad22bcac988e3aadba9651fab9d79d (diff) | |
| download | chromium_src-9cc92df2e18c1a62e037decf5326e32fecc96b35.zip chromium_src-9cc92df2e18c1a62e037decf5326e32fecc96b35.tar.gz chromium_src-9cc92df2e18c1a62e037decf5326e32fecc96b35.tar.bz2 | |
Enable tests of chrome.tab.captureVisibleTab() on mac, and all tab tests on linux.
BUG=39746,37387
Review URL: http://codereview.chromium.org/1540010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -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_; |