Commit ba54c0e2 authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Re-enable disabled test in chrome/browser/ui/tabs/.

This passes on Windows.

Bug: 302156
Change-Id: I5cc2048eeb76be8846419b02b145834956b56a14
Reviewed-on: https://chromium-review.googlesource.com/c/1351101Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611153}
parent 871a1ef5
...@@ -1923,15 +1923,8 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) { ...@@ -1923,15 +1923,8 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) {
strip.CloseAllTabs(); strip.CloseAllTabs();
} }
// This fails on Linux when run with the rest of unit_tests (crbug.com/302156)
// and fails consistently on Mac and Windows.
#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
#define MAYBE_FastShutdown DISABLED_FastShutdown
#else
#define MAYBE_FastShutdown FastShutdown
#endif
// Tests that fast shutdown is attempted appropriately. // Tests that fast shutdown is attempted appropriately.
TEST_F(TabStripModelTest, MAYBE_FastShutdown) { TEST_F(TabStripModelTest, FastShutdown) {
TabStripDummyDelegate delegate; TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile()); TabStripModel tabstrip(&delegate, profile());
MockTabStripModelObserver observer(&tabstrip); MockTabStripModelObserver observer(&tabstrip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment