chrome/browser/sessions/session_restore_browsertest.cc - Issue 328713006: Merge 275988 "Move about://-related constants from //content to ..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 328713006: Merge 275988 "Move about://-related constants from //content to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2042/src/

Patch Set: Created 6 years, 6 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/better_session_restore_browsertest.cc ('k') | chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/session_restore_browsertest.cc

===================================================================

--- chrome/browser/sessions/session_restore_browsertest.cc (revision 276109)

+++ chrome/browser/sessions/session_restore_browsertest.cc (working copy)

@@ -199,10 +199,14 @@

IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoredTabsShouldHaveRootWindow) {

// Create tabs.

ui_test_utils::NavigateToURLWithDisposition(

- browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB,

+ browser(),

+ GURL(url::kAboutBlankURL),

+ NEW_FOREGROUND_TAB,

ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);

ui_test_utils::NavigateToURLWithDisposition(

- browser(), GURL(content::kAboutBlankURL), NEW_BACKGROUND_TAB,

+ browser(),

+ GURL(url::kAboutBlankURL),

+ NEW_BACKGROUND_TAB,

ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);

// Restart and session restore the tabs.

@@ -950,7 +954,9 @@

// Open a second window.

ui_test_utils::NavigateToURLWithDisposition(

- browser(), GURL(content::kAboutBlankURL), NEW_WINDOW,

+ browser(),

+ GURL(url::kAboutBlankURL),

+ NEW_WINDOW,

ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);

ASSERT_EQ(2u, active_browser_list_->size());

@@ -983,10 +989,14 @@

IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ShareProcessesOnRestore) {

// Create two new tabs.

ui_test_utils::NavigateToURLWithDisposition(

- browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB,

+ browser(),

+ GURL(url::kAboutBlankURL),

+ NEW_FOREGROUND_TAB,

ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);

ui_test_utils::NavigateToURLWithDisposition(

- browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB,

+ browser(),

+ GURL(url::kAboutBlankURL),

+ NEW_FOREGROUND_TAB,

ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);

int expected_process_count = RenderProcessHostCount();