Offer to open the startup pages after a crash.

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 840 matching lines @@
 
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
   ASSERT_EQ(1u, active_browser_list_->size());
   ASSERT_EQ(url2_,
             new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
   GoBack(new_browser);
   ASSERT_EQ(url1_,
             new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
+IN_PROC_BROWSER_TEST_F(SessionRestoreTest, StartupPagesWithOnlyNtp) {
+  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
+  SessionStartupPref pref(SessionStartupPref::URLS);
+  pref.urls.push_back(url1_);
+  pref.urls.push_back(url2_);
+  SessionStartupPref::SetStartupPref(browser()->profile(), pref);
+
+  SessionRestore::OpenStartupPagesAfterCrash(browser());
+
+  ASSERT_EQ(1u, active_browser_list_->size());
+  ASSERT_EQ(2, browser()->tab_strip_model()->count());
+  EXPECT_EQ(url1_, browser()->tab_strip_model()->GetWebContentsAt(0)->GetURL());
+  EXPECT_EQ(url2_, browser()->tab_strip_model()->GetWebContentsAt(1)->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(SessionRestoreTest, StartupPagesWithExistingPages) {
+  ui_test_utils::NavigateToURL(browser(), url3_);
+
+  SessionStartupPref pref(SessionStartupPref::URLS);
+  pref.urls.push_back(url1_);
+  pref.urls.push_back(url2_);
+  SessionStartupPref::SetStartupPref(browser()->profile(), pref);
+
+  SessionRestore::OpenStartupPagesAfterCrash(browser());
+
+  ASSERT_EQ(1u, active_browser_list_->size());
+  ASSERT_EQ(3, browser()->tab_strip_model()->count());
+  EXPECT_EQ(url3_, browser()->tab_strip_model()->GetWebContentsAt(0)->GetURL());
+  EXPECT_EQ(url1_, browser()->tab_strip_model()->GetWebContentsAt(1)->GetURL());
+  EXPECT_EQ(url2_, browser()->tab_strip_model()->GetWebContentsAt(2)->GetURL());
+}
+
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NoMemoryPressureLoadsAllTabs) {
   // Add several tabs to the browser. Restart the browser and check that all
   // tabs got loaded properly.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(url::kAboutBlankURL),
       WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(url::kAboutBlankURL),
       WindowOpenDisposition::NEW_FOREGROUND_TAB,
@@ skipping 707 matching lines @@
   // automatically at the start of the test.
   for (size_t i = 1; i < web_contents().size(); i++) {
     GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]);
     ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
     if (i > 0) {
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 }