| 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 1d6428488fe5271dc901ea4b5b599069abe43f36..e6621637db3379ca9f0c5dc58d9102f348560718 100644
|
| --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
|
| +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
|
| @@ -1709,8 +1709,16 @@ 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)
|
| +#define MAYBE_FastShutdown \
|
| + DISABLED_FastShutdown
|
| +#else
|
| +#define MAYBE_FastShutdown \
|
| + FastShutdown
|
| +#endif
|
| // Tests that fast shutdown is attempted appropriately.
|
| -TEST_F(TabStripModelTest, FastShutdown) {
|
| +TEST_F(TabStripModelTest, MAYBE_FastShutdown) {
|
| TabStripDummyDelegate delegate;
|
| TabStripModel tabstrip(&delegate, profile());
|
| MockTabStripModelObserver observer(&tabstrip);
|
|
|