summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/session_restore_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sessions/session_restore_uitest.cc')
-rw-r--r--chrome/browser/sessions/session_restore_uitest.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index a09a543..88406fe 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -399,6 +399,12 @@ TEST_F(SessionRestoreUITest, FLAKY_TwoWindowsCloseOneRestoreOnlyOne) {
ASSERT_EQ(url1_, GetActiveTabURL());
}
+#if defined(OS_LINUX)
+// Disabled on linux - http://crbug.com/40946.
+#define FLAKY_RestoreAfterClosingTabbedBrowserWithAppAndLaunching \
+ DISABLED_RestoreAfterClosingTabbedBrowserWithAppAndLaunching
+#endif
+
// Launches an app window, closes tabbed browser, launches and makes sure
// we restore the tabbed browser url.
TEST_F(SessionRestoreUITest,