diff options
author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-23 04:00:32 +0000 |
---|---|---|
committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-23 04:00:32 +0000 |
commit | e2d74791bd918b1c071534d29d84f02ac7381c98 (patch) | |
tree | 7fbb4e1921ad32549d9f945996a3817d85ca31fe /chrome/browser | |
parent | bbd31157f121c2e12758b32efd60e26d5662494e (diff) | |
download | chromium_src-e2d74791bd918b1c071534d29d84f02ac7381c98.zip chromium_src-e2d74791bd918b1c071534d29d84f02ac7381c98.tar.gz chromium_src-e2d74791bd918b1c071534d29d84f02ac7381c98.tar.bz2 |
Disable ExtensionOverrideTest.OverrideNewtab, which is hangy
BUG=70511
TEST=greener tree
TBR= mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/6352014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/extensions/extension_override_apitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc index 4fd73f4..634465b 100644 --- a/chrome/browser/extensions/extension_override_apitest.cc +++ b/chrome/browser/extensions/extension_override_apitest.cc @@ -72,7 +72,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) { // Verify behavior, then unload the first and verify behavior, etc. } -IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtabIncognito) { +#if defined(OS_MACOSX) +// Hangy: http://crbug.com/70511 +#define MAYBE_OverrideNewtabIncognito DISABLED_OverrideNewtabIncognito +#else +#define MAYBE_OverrideNewtabIncognito OverrideNewtabIncognito +#endif +IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) { ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_; // Navigate an incognito tab to the new tab page. We should get the actual |