Index: chrome/browser/ui/tabs/tab_strip_model_unittest.cc |
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc |
index e6621637db3379ca9f0c5dc58d9102f348560718..2583f3028eccc214ec1596750a859c2fb023b1b4 100644 |
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc |
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc |
@@ -1709,8 +1709,9 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) { |
strip.CloseAllTabs(); |
} |
-// This fails on linux when run with the rest of unit_tests (crbug.com/302156). |
-#if defined(OS_LINUX) |
+// This fails on Linux when run with the rest of unit_tests (crbug.com/302156) |
+// and fails consistently on Mac 64. |
+#if defined(OS_LINUX) || (defined(OS_MACOSX) && ARCH_CPU_64_BITS) |
#define MAYBE_FastShutdown \ |
Nico
2013/10/02 18:22:17
Just disable it for all platforms maybe?
Avi (use Gerrit)
2013/10/02 18:25:31
I feel really awkward killing tests.
|
DISABLED_FastShutdown |
#else |