Merge 275988 "Move about://-related constants from //content to ..."

chrome/browser/sessions/better_session_restore_browsertest.cc

Index: chrome/browser/sessions/better_session_restore_browsertest.cc
===================================================================
--- chrome/browser/sessions/better_session_restore_browsertest.cc	(revision 276109)
+++ chrome/browser/sessions/better_session_restore_browsertest.cc	(working copy)
@@ -680,8 +680,7 @@
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, SessionCookies) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(content::kAboutBlankURL),
-            web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec());
   // When we navigate to the page again, it doens't see the data previously
   // stored.
   StoreDataWithPage("session_cookies.html");
@@ -694,8 +693,7 @@
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, SessionStorage) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(content::kAboutBlankURL),
-            web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec());
   StoreDataWithPage("session_storage.html");
 }
 
@@ -708,8 +706,7 @@
   // Normally localStorage is persisted.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(content::kAboutBlankURL),
-            web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec());
   NavigateAndCheckStoredData("local_storage.html");
   // ... but not if it's set to clear on exit.
   CookieSettings::Factory::GetForProfile(browser()->profile())->
@@ -719,8 +716,7 @@
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, LocalStorageClearedOnExit) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(content::kAboutBlankURL),
-            web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec());
   StoreDataWithPage("local_storage.html");
 }
 
@@ -732,8 +728,7 @@
   // Normally cookies are restored.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(content::kAboutBlankURL),
-            web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec());
   NavigateAndCheckStoredData("cookies.html");
   // ... but not if the content setting is set to clear on exit.
   CookieSettings::Factory::GetForProfile(browser()->profile())->
@@ -743,8 +738,7 @@
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, CookiesClearedOnExit) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(content::kAboutBlankURL),
-            web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec());
   StoreDataWithPage("local_storage.html");
 }