| 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 029200b4a1c84b936f11e237619a3a790798a7d6..5424bca84faf044effe8bf7c1e86c37ad0daf149 100644
|
| --- a/chrome/browser/sessions/session_restore_browsertest.cc
|
| +++ b/chrome/browser/sessions/session_restore_browsertest.cc
|
| @@ -199,10 +199,14 @@ class SessionRestoreTest : public InProcessBrowserTest {
|
| 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 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) {
|
|
|
| // 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, TwoWindowsCloseOneRestoreOnlyOne) {
|
| 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();
|
|
|