Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: chrome/browser/sessions/session_restore_browsertest.cc

Issue 2644663003: Offer to open the startup pages after a crash. (Closed)
Patch Set: Rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sessions/session_restore.cc ('k') | chrome/browser/ui/startup/startup_browser_creator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1f74e1ea23fdb37d17b317ec6d4a050831d9b49a..f749e564a3954f5870ae08c89e86ac35d0757791 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -858,6 +858,38 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, Basic) {
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.
« no previous file with comments | « chrome/browser/sessions/session_restore.cc ('k') | chrome/browser/ui/startup/startup_browser_creator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698