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