| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index 1d6a7923ca49023d409460e9d7c649969a33cb76..560a6ea2a6c3fdbdbec2834732ff7b19b6ee66f0 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -2907,7 +2907,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTargetHasPopup) {
|
| PrerenderTestURL("files/prerender/prerender_page.html",
|
| FINAL_STATUS_NON_EMPTY_BROWSING_INSTANCE,
|
| 1);
|
| - OpenURLViaWindowOpen(GURL(content::kAboutBlankURL));
|
| + OpenURLViaWindowOpen(GURL(url::kAboutBlankURL));
|
| NavigateToDestURLWithDisposition(CURRENT_TAB, false);
|
| }
|
|
|
| @@ -4014,7 +4014,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageNewTabCrossProcess) {
|
|
|
| // Navigate to about:blank so the next navigation is cross-process.
|
| ui_test_utils::NavigateToURL(current_browser(),
|
| - GURL(content::kAboutBlankURL));
|
| + GURL(url::kAboutBlankURL));
|
|
|
| // Now navigate in the new tab. Set expect_swap_to_succeed to false because
|
| // the swap does not occur synchronously.
|
| @@ -4067,7 +4067,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReplaceCurrentEntry) {
|
| // First entry is about:blank, second is prerender_page.html.
|
| EXPECT_TRUE(controller.GetPendingEntry() == NULL);
|
| EXPECT_EQ(2, controller.GetEntryCount());
|
| - EXPECT_EQ(GURL(content::kAboutBlankURL),
|
| + EXPECT_EQ(GURL(url::kAboutBlankURL),
|
| controller.GetEntryAtIndex(0)->GetURL());
|
| EXPECT_EQ(dest_url(), controller.GetEntryAtIndex(1)->GetURL());
|
| }
|
| @@ -4098,7 +4098,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDoublePendingSwap) {
|
|
|
| // Open a new tab to navigate in.
|
| ui_test_utils::NavigateToURLWithDisposition(
|
| - current_browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB,
|
| + current_browser(), GURL(url::kAboutBlankURL), NEW_FOREGROUND_TAB,
|
| ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
|
|
|
| // Fire off two navigations, without running the event loop between them.
|
| @@ -4122,7 +4122,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDoublePendingSwap) {
|
| EXPECT_TRUE(controller.GetPendingEntry() == NULL);
|
| EXPECT_LE(2, controller.GetEntryCount());
|
| EXPECT_GE(3, controller.GetEntryCount());
|
| - EXPECT_EQ(GURL(content::kAboutBlankURL),
|
| + EXPECT_EQ(GURL(url::kAboutBlankURL),
|
| controller.GetEntryAtIndex(0)->GetURL());
|
| EXPECT_EQ(url2, controller.GetEntryAtIndex(
|
| controller.GetEntryCount() - 1)->GetURL());
|
| @@ -4138,7 +4138,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
|
|
| // Open a new tab to navigate in.
|
| ui_test_utils::NavigateToURLWithDisposition(
|
| - current_browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB,
|
| + current_browser(), GURL(url::kAboutBlankURL), NEW_FOREGROUND_TAB,
|
| ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
|
|
|
| // Navigate to the URL. Wait for DidStartLoading, just so it's definitely
|
| @@ -4155,7 +4155,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| // Navigate somewhere else. This should succeed and abort the pending swap.
|
| TestNavigationObserver nav_observer(GetActiveWebContents());
|
| current_browser()->OpenURL(OpenURLParams(
|
| - GURL(content::kAboutBlankURL), Referrer(), CURRENT_TAB,
|
| + GURL(url::kAboutBlankURL), Referrer(), CURRENT_TAB,
|
| content::PAGE_TRANSITION_TYPED, false));
|
| nav_observer.Wait();
|
| }
|
|
|