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.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index 9e56711..051ecf7 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -6,7 +6,7 @@
#include "base/file_path.h"
#include "base/scoped_ptr.h"
#include "base/string_number_conversions.h"
-#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/defaults.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -378,6 +378,7 @@ TEST_F(SessionRestoreUITest, DontRestoreWhileIncognito) {
// Launches an app window, closes tabbed browser, launches and makes sure
// we restore the tabbed browser url.
+// Flaky: http://crbug.com/29110
TEST_F(SessionRestoreUITest,
FLAKY_RestoreAfterClosingTabbedBrowserWithAppAndLaunching) {
NavigateToURL(url1_);