Make sure that the browser will always restore settings page instead of sign out page after user si…

chrome/browser/sessions/session_restore_browsertest.cc

Index: chrome/browser/sessions/session_restore_browsertest.cc
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 8daee1190647c3874e2d7ccc4444ccad715357f7..7553639d290f147c999a965eefcb350b1fafd432 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -1412,6 +1412,17 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorageAfterTabReplace) {
   EXPECT_EQ(1, new_browser->tab_strip_model()->count());
 }
 
+IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoresSignOutPage) {

[sky, 2016/11/09 22:24:04]

Writing a browser test for this is very heavy. How about moving the function you
care about into a static function that can be called from the test?

[zmin, 2016/11/10 22:36:07]

I moved this function to session_common_utils.cc and add a unit test for it.

+  const GURL settings_page("chrome://settings");
+  const GURL sign_out_page("chrome://settings/signOut");
+  ui_test_utils::NavigateToURL(browser(), settings_page);
+  ui_test_utils::NavigateToURL(browser(), sign_out_page);
+  Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
+  ASSERT_EQ(1u, active_browser_list_->size());
+  ASSERT_EQ(settings_page,
+            new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
+}
+
 IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, PRE_CorrectLoadingOrder) {
   Profile* profile = browser()->profile();