Index: chrome/browser/ui/browser_navigator_browsertest.cc |
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc |
index 8c0181d64397c0db3fe569a12e240c74416a9452..c448b84e50f40a7061662262d3da8f04c238fffb 100644 |
--- a/chrome/browser/ui/browser_navigator_browsertest.cc |
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc |
@@ -1156,12 +1156,13 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, |
browser()->GetSelectedWebContents()->GetURL()); |
} |
-#if defined(OS_MACOSX) |
+// Times out on mac, fails on linux. |
+// http://crbug.com/119779 |
+#if defined(OS_MACOSX) || defined(OS_LINUX) |
#define MAYBE_NavigateFromOtherTabToSingletonOptions DISABLED_NavigateFromOtherTabToSingletonOptions |
#else |
#define MAYBE_NavigateFromOtherTabToSingletonOptions NavigatorFrameOtherTabToSingletonOptions |
#endif |
- |
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, |
MAYBE_NavigateFromOtherTabToSingletonOptions) { |
{ |