diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 01:09:30 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 01:09:30 +0000 |
| commit | 4f32c150be688665f09abd5b0af4090cfacfb7ed (patch) | |
| tree | 2742010aafb1874c71be39ef6f86edea1fe57b6a /chrome/browser/extensions/extension_override_apitest.cc | |
| parent | b4f80c84e4ab6c4c7bfe6e61015262a05d62ef1b (diff) | |
| download | chromium_src-4f32c150be688665f09abd5b0af4090cfacfb7ed.zip chromium_src-4f32c150be688665f09abd5b0af4090cfacfb7ed.tar.gz chromium_src-4f32c150be688665f09abd5b0af4090cfacfb7ed.tar.bz2 | |
Disable ExtensionOverrideTest.OverrideHistory on Windows, because it's consistenly hanging.
TBR=rafaelw
BUG=45173
TEST=ExtensionOverrideTest.OverrideHistory
Review URL: http://codereview.chromium.org/2240006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_override_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_override_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc index 61309f3..3063975 100644 --- a/chrome/browser/extensions/extension_override_apitest.cc +++ b/chrome/browser/extensions/extension_override_apitest.cc @@ -76,7 +76,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtabIncognito) { SchemeIs(chrome::kExtensionScheme)); } -IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideHistory) { +// Times out consistently on Win, http://crbug.com/45173. +#if defined(OS_WIN) +#define MAYBE_OverrideHistory DISABLED_OverrideHistory +#else +#define MAYBE_OverrideHistory OverrideHistory +#endif // defined(OS_WIN) + +IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideHistory) { ASSERT_TRUE(RunExtensionTest("override/history")) << message_; { ResultCatcher catcher; |