summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_override_apitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_override_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_override_apitest.cc9
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;