content: Move two more url constants into content namespace.

TBR=joi@chromium.org, thestig@chromium.org

Review URL: https://codereview.chromium.org/14698018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200165 0039d316-1c4b-4281-b951-d872f2087c98

53 files changed, 125 insertions, 119 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index 2d47b5a..f45eedf 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -70,14 +70,14 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
   OmniboxView* location_entry = location_bar->GetLocationEntry();
 
   EXPECT_TRUE(location_bar->GetInputString().empty());
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
   // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across
   // platforms.
 
   location_bar->FocusLocation(true);
 
   EXPECT_TRUE(location_bar->GetInputString().empty());
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
   EXPECT_TRUE(location_entry->IsSelectAll());
 
   location_entry->SetUserText(ASCIIToUTF16("chrome"));
@@ -89,14 +89,14 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
   location_entry->RevertAll();
 
   EXPECT_TRUE(location_bar->GetInputString().empty());
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
   EXPECT_FALSE(location_entry->IsSelectAll());
 
   location_entry->SetUserText(ASCIIToUTF16("chrome"));
   location_bar->Revert();
 
   EXPECT_TRUE(location_bar->GetInputString().empty());
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
   EXPECT_FALSE(location_entry->IsSelectAll());
 }
 
@@ -145,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) {
     OmniboxView* location_entry = location_bar->GetLocationEntry();
 
     EXPECT_TRUE(location_bar->GetInputString().empty());
-    EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+    EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
     EXPECT_FALSE(location_entry->IsSelectAll());
     const AutocompleteResult& result = autocomplete_controller->result();
     EXPECT_TRUE(result.empty()) << AutocompleteResultAsString(result);
@@ -159,17 +159,17 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) {
   // and select all.
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* location_entry = location_bar->GetLocationEntry();
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
   location_entry->SetUserText(string16());
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL),
+  chrome::AddSelectedTabWithURL(browser(), GURL(content::kAboutBlankURL),
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   observer.Wait();
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
   chrome::CloseTab(browser());
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
   EXPECT_TRUE(location_entry->IsSelectAll());
 }
 
@@ -181,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
   // Focus search when omnibox is blank
   {
     EXPECT_TRUE(location_bar->GetInputString().empty());
-    EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
+    EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), location_entry->GetText());
 
     location_bar->FocusSearch();
     EXPECT_TRUE(location_bar->GetInputString().empty());
diff --git a/chrome/browser/autofill/autofill_external_delegate_browsertest.cc b/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
index 2d18ba2..87c7200 100644
--- a/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
+++ b/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
@@ -132,7 +132,7 @@ IN_PROC_BROWSER_TEST_F(AutofillExternalDelegateBrowserTest,
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
       content::Source<content::WebContents>(web_contents_));
-  chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL),
+  chrome::AddSelectedTabWithURL(browser(), GURL(content::kAboutBlankURL),
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   observer.Wait();
 }
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 8d5d320..079a3f1 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -111,7 +111,7 @@ bool WillHandleBrowserAboutURL(GURL* url,
   *url = URLFixerUpper::FixupURL(url->possibly_invalid_spec(), std::string());
 
   // Check that about: URLs are fixed up to chrome: by URLFixerUpper::FixupURL.
-  DCHECK((*url == GURL(chrome::kAboutBlankURL)) ||
+  DCHECK((*url == GURL(content::kAboutBlankURL)) ||
          !url->SchemeIs(chrome::kAboutScheme));
 
   // Only handle chrome://foo/, URLFixerUpper::FixupURL translates about:foo.
diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc
index 54f45f2..de105be 100644
--- a/chrome/browser/browser_about_handler_unittest.cc
+++ b/chrome/browser/browser_about_handler_unittest.cc
@@ -28,8 +28,8 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) {
         GURL("http://google.com")
       },
       {
-        GURL(chrome::kAboutBlankURL),
-        GURL(chrome::kAboutBlankURL)
+        GURL(content::kAboutBlankURL),
+        GURL(content::kAboutBlankURL)
       },
       {
         GURL(chrome_prefix + chrome::kChromeUIMemoryHost),
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc
index 9d5cc10..298b488 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -26,7 +26,7 @@ using content::WebContents;
 // Tests IDC_SELECT_TAB_0, IDC_SELECT_NEXT_TAB, IDC_SELECT_PREVIOUS_TAB and
 // IDC_SELECT_LAST_TAB.
 TEST_F(BrowserCommandsTest, TabNavigationAccelerators) {
-  GURL about_blank(chrome::kAboutBlankURL);
+  GURL about_blank(content::kAboutBlankURL);
 
   // Create three tabs.
   AddTab(browser(), about_blank);
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 80fbd18..df3c769 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -2065,7 +2065,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) {
                                         browser()->host_desktop_type()));
   // Navigate the new browser window so it'll be shown and we can pick the
   // active window.
-  ui_test_utils::NavigateToURL(browser2, GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser2, GURL(content::kAboutBlankURL));
 
   // Generally, |browser2| will be the active window.  However, if the
   // original browser window lost focus before creating the new one, such as
diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc
index 95b093a..b0eef90 100644
--- a/chrome/browser/chromeos/login/screens/user_image_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc
@@ -46,7 +46,7 @@ UserImageScreen::UserImageScreen(ScreenObserver* screen_observer,
       accept_photo_after_decoding_(false),
       selected_image_(User::kInvalidImageIndex),
       profile_picture_enabled_(false),
-      profile_picture_data_url_(chrome::kAboutBlankURL),
+      profile_picture_data_url_(content::kAboutBlankURL),
       profile_picture_absent_(false) {
   actor_->SetDelegate(this);
   SetProfilePictureEnabled(true);
diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.cc b/chrome/browser/chromeos/login/user_image_manager_impl.cc
index 238bb06..5c891bf 100644
--- a/chrome/browser/chromeos/login/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_image_manager_impl.cc
@@ -178,7 +178,7 @@ UserImageManagerImpl::UserImageManagerImpl()
     : image_loader_(new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC)),
       unsafe_image_loader_(new UserImageLoader(ImageDecoder::DEFAULT_CODEC)),
       last_image_set_async_(false),
-      downloaded_profile_image_data_url_(chrome::kAboutBlankURL),
+      downloaded_profile_image_data_url_(content::kAboutBlankURL),
       downloading_profile_image_(false),
       migrate_current_user_on_load_(false) {
 }
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index 2db6e96..7255501 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -99,7 +99,7 @@ RenderViewHost* BrowserListTabContentsProvider::CreateNewTarget() {
 
   content::WebContents* web_contents = chrome::AddSelectedTabWithURL(
       browser_list->get(0),
-      GURL(chrome::kAboutBlankURL),
+      GURL(content::kAboutBlankURL),
       content::PAGE_TRANSITION_LINK);
   return web_contents->GetRenderViewHost();
 }
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index d60d42c..7a61ff3 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -605,7 +605,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, NoSave) {
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   EXPECT_FALSE(chrome::CanSavePage(browser()));
 }
 
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
index 11bcb5a..4478010 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
@@ -81,8 +81,8 @@ bool FrameNavigationState::IsValidUrl(const GURL& url) const {
       return true;
   }
   // Allow about:blank and about:srcdoc.
-  if (url.spec() == chrome::kAboutBlankURL ||
-      url.spec() == chrome::kAboutSrcDocURL) {
+  if (url.spec() == content::kAboutBlankURL ||
+      url.spec() == content::kAboutSrcDocURL) {
     return true;
   }
   if (allow_extension_scheme_ && url.scheme() == extensions::kExtensionScheme)
@@ -101,7 +101,7 @@ void FrameNavigationState::TrackFrame(FrameID frame_id,
   frame_state.url = url;
   frame_state.is_main_frame = is_main_frame;
   frame_state.is_iframe_srcdoc = is_iframe_srcdoc;
-  DCHECK(!is_iframe_srcdoc || url == GURL(chrome::kAboutBlankURL));
+  DCHECK(!is_iframe_srcdoc || url == GURL(content::kAboutBlankURL));
   frame_state.is_navigating = true;
   frame_state.is_committed = false;
   frame_state.is_server_redirected = false;
@@ -179,7 +179,7 @@ GURL FrameNavigationState::GetUrl(FrameID frame_id) const {
     return GURL();
   }
   if (frame_state->second.is_iframe_srcdoc)
-    return GURL(chrome::kAboutSrcDocURL);
+    return GURL(content::kAboutSrcDocURL);
   return frame_state->second.url;
 }
 
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
index 9ee909d..575a4de 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -565,9 +565,10 @@ void WebNavigationTabObserver::DidFinishLoad(
   navigation_state_.SetNavigationCompleted(frame_id);
   if (!navigation_state_.CanSendEvents(frame_id))
     return;
-  DCHECK(navigation_state_.GetUrl(frame_id) == validated_url ||
-         (navigation_state_.GetUrl(frame_id) == GURL(chrome::kAboutSrcDocURL) &&
-          validated_url == GURL(chrome::kAboutBlankURL)))
+  DCHECK(
+      navigation_state_.GetUrl(frame_id) == validated_url ||
+      (navigation_state_.GetUrl(frame_id) == GURL(content::kAboutSrcDocURL) &&
+       validated_url == GURL(content::kAboutBlankURL)))
       << "validated URL is " << validated_url << " but we expected "
       << navigation_state_.GetUrl(frame_id);
   DCHECK_EQ(navigation_state_.IsMainFrame(frame_id), is_main_frame);
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index 5bb2367..4a40313 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -494,7 +494,7 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, OneHistoryTabPerWindow) {
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(), GURL(chrome::kAboutBlankURL), NEW_FOREGROUND_TAB,
+      browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   chrome::ExecuteCommand(browser(), IDC_SHOW_HISTORY);
 
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index 6bdc894..cd126c5 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -1009,7 +1009,7 @@ bool HistoryService::CanAddURL(const GURL& url) {
 
   // Allow all about: and chrome: URLs except about:blank, since the user may
   // like to see "chrome://memory/", etc. in their history and autocomplete.
-  if (url == GURL(chrome::kAboutBlankURL))
+  if (url == GURL(content::kAboutBlankURL))
     return false;
 
   return true;
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc
index f941c4b..63c6c53 100644
--- a/chrome/browser/net/url_fixer_upper.cc
+++ b/chrome/browser/net/url_fixer_upper.cc
@@ -527,7 +527,7 @@ GURL URLFixerUpper::FixupURL(const std::string& text,
   }
 
   // Parse and rebuild about: and chrome: URLs, except about:blank.
-  bool chrome_url = !LowerCaseEqualsASCII(trimmed, chrome::kAboutBlankURL) &&
+  bool chrome_url = !LowerCaseEqualsASCII(trimmed, content::kAboutBlankURL) &&
       ((scheme == chrome::kAboutScheme) || (scheme == chrome::kChromeUIScheme));
 
   // For some schemes whose layouts we understand, we rebuild it.
diff --git a/chrome/browser/page_cycler/page_cycler_unittest.cc b/chrome/browser/page_cycler/page_cycler_unittest.cc
index 5bdc135..7fcd667 100644
--- a/chrome/browser/page_cycler/page_cycler_unittest.cc
+++ b/chrome/browser/page_cycler/page_cycler_unittest.cc
@@ -35,7 +35,7 @@ using file_util::PathExists;
 namespace {
 const int kFrameID = 1;
 const bool kIsMainFrame = true;
-const GURL kAboutURL = GURL(chrome::kAboutBlankURL);
+const GURL kAboutURL = GURL(content::kAboutBlankURL);
 }  // namespace
 
 class MockPageCycler : public PageCycler {
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 3a7a78d..3da7be2 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -755,7 +755,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
   EXPECT_EQ(expected, web_contents->GetURL());
 
   // Verify that searching from the omnibox can be disabled.
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
   EXPECT_TRUE(service->GetDefaultSearchProvider());
@@ -764,7 +764,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
   ui_test_utils::SendToOmniboxAndSubmit(location_bar, "should not work");
   // This means that submitting won't trigger any action.
   EXPECT_FALSE(model->CurrentMatch().destination_url.is_valid());
-  EXPECT_EQ(GURL(chrome::kAboutBlankURL), web_contents->GetURL());
+  EXPECT_EQ(GURL(content::kAboutBlankURL), web_contents->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(PolicyTest, ForceSafeSearch) {
@@ -931,7 +931,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ReplaceSearchTerms) {
 // The linux and win  bots can't create a GL context. http://crbug.com/103379
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   // WebGL is enabled by default.
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
@@ -1392,7 +1392,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
             browser()->profile()->GetHomePage());
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(GURL(chrome::kAboutBlankURL), contents->GetURL());
+  EXPECT_EQ(GURL(content::kAboutBlankURL), contents->GetURL());
   EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME));
   EXPECT_EQ(GURL(chrome::kChromeUIPolicyURL), contents->GetURL());
 
@@ -1456,7 +1456,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
                POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
   UpdateProviderPolicy(policies);
   // Reload the page.
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   EXPECT_FALSE(IsJavascriptEnabled(contents));
   // Developer tools still work when javascript is disabled.
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_DEV_TOOLS));
@@ -1466,13 +1466,13 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
   EXPECT_TRUE(IsJavascriptEnabled(contents));
 
   // The javascript content setting policy overrides the javascript policy.
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   EXPECT_FALSE(IsJavascriptEnabled(contents));
   policies.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
                base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
   UpdateProviderPolicy(policies);
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   EXPECT_TRUE(IsJavascriptEnabled(contents));
 }
 
diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc
index aaebbdf..e7ec7f2 100644
--- a/chrome/browser/popup_blocker_browsertest.cc
+++ b/chrome/browser/popup_blocker_browsertest.cc
@@ -151,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, PopupsLaunchWhenTabIsClosed) {
       base::FilePath(FILE_PATH_LITERAL("popup-on-unload.html")));
   ui_test_utils::NavigateToURL(browser(), url);
 
-  NavigateAndCheckPopupShown(browser(), GURL(chrome::kAboutBlankURL));
+  NavigateAndCheckPopupShown(browser(), GURL(content::kAboutBlankURL));
 }
 
 // Verify that when you unblock popup, the popup shows in history and omnibox.
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 9afe945..6eb42fe 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -633,7 +633,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareDontProceed) {
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(
-      GURL(chrome::kAboutBlankURL),  // Back to "about:blank"
+      GURL(content::kAboutBlankURL),  // Back to "about:blank"
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
@@ -679,7 +679,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   EXPECT_EQ(
-      GURL(chrome::kAboutBlankURL),  // Back to "about:blank"
+      GURL(content::kAboutBlankURL),  // Back to "about:blank"
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
@@ -736,7 +736,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ProceedDisabled) {
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);
   EXPECT_EQ(
-      GURL(chrome::kAboutBlankURL),  // Back to "about:blank"
+      GURL(content::kAboutBlankURL),  // Back to "about:blank"
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
@@ -766,7 +766,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ReportingDisabled) {
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(
-      GURL(chrome::kAboutBlankURL),  // Back to "about:blank"
+      GURL(content::kAboutBlankURL),  // Back to "about:blank"
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
@@ -788,7 +788,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) {
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
   EXPECT_EQ(
-      GURL(chrome::kAboutBlankURL),  // We are back to "about:blank".
+      GURL(content::kAboutBlankURL),  // We are back to "about:blank".
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index a80c8f9..b1aac39 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -464,7 +464,8 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_SessionCookies) {
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, SessionCookies) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(chrome::kAboutBlankURL), web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(content::kAboutBlankURL),
+            web_contents->GetURL().spec());
   // When we navigate to the page again, it doens't see the data previously
   // stored.
   StoreDataWithPage("session_cookies.html");
@@ -477,7 +478,8 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_SessionStorage) {
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, SessionStorage) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(chrome::kAboutBlankURL), web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(content::kAboutBlankURL),
+            web_contents->GetURL().spec());
   StoreDataWithPage("session_storage.html");
 }
 
@@ -490,7 +492,8 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_LocalStorageClearedOnExit) {
   // Normally localStorage is persisted.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(chrome::kAboutBlankURL), web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(content::kAboutBlankURL),
+            web_contents->GetURL().spec());
   NavigateAndCheckStoredData("local_storage.html");
   // ... but not if it's set to clear on exit.
   CookieSettings::Factory::GetForProfile(browser()->profile())->
@@ -500,7 +503,8 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_LocalStorageClearedOnExit) {
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, LocalStorageClearedOnExit) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(chrome::kAboutBlankURL), web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(content::kAboutBlankURL),
+            web_contents->GetURL().spec());
   StoreDataWithPage("local_storage.html");
 }
 
@@ -512,7 +516,8 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_CookiesClearedOnExit) {
   // Normally cookies are restored.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(chrome::kAboutBlankURL), web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(content::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())->
@@ -522,6 +527,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_CookiesClearedOnExit) {
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, CookiesClearedOnExit) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(std::string(chrome::kAboutBlankURL), web_contents->GetURL().spec());
+  EXPECT_EQ(std::string(content::kAboutBlankURL),
+            web_contents->GetURL().spec());
   StoreDataWithPage("local_storage.html");
 }
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 89b5741..4fa5cd5 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -872,7 +872,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) {
 
   // Open a second window.
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(), GURL(chrome::kAboutBlankURL), NEW_WINDOW,
+      browser(), GURL(content::kAboutBlankURL), NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
 
   ASSERT_EQ(2u, native_browser_list->size());
@@ -905,10 +905,10 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) {
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ShareProcessesOnRestore) {
   // Create two new tabs.
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(), GURL(chrome::kAboutBlankURL), NEW_FOREGROUND_TAB,
+      browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(), GURL(chrome::kAboutBlankURL), NEW_FOREGROUND_TAB,
+      browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   int expected_process_count = RenderProcessHostCount();
diff --git a/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_unittest.cc
index bc285a5..84aa632 100644
--- a/chrome/browser/ui/bookmarks/bookmark_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_unittest.cc
@@ -25,7 +25,7 @@ TEST_F(BookmarkTest, DetachedBookmarkBarOnCustomNTP) {
   content::WebContents* web_contents = content::WebContents::Create(
       content::WebContents::CreateParams(browser()->profile()));
   web_contents->GetController().LoadURL(
-        GURL(chrome::kAboutBlankURL), content::Referrer(),
+        GURL(content::kAboutBlankURL), content::Referrer(),
         content::PAGE_TRANSITION_LINK, std::string());
 
   // Give it a NTP virtual URL.
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index f81660d..a47d2ba 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -852,7 +852,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) {
   ui_test_utils::NavigateToURL(browser(), downloads_url);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 
-  GURL blank_url(chrome::kAboutBlankURL);
+  GURL blank_url(content::kAboutBlankURL);
   ui_test_utils::NavigateToURL(browser(), blank_url);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 }
@@ -1109,7 +1109,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) {
 
   // Add a pinned non-app tab.
   chrome::NewTab(browser());
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   model->SetTabPinned(2, true);
 
   // Write out the pinned tabs.
@@ -1253,7 +1253,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_StartMinimized) {
 // Makes sure the forward button is disabled immediately when navigating
 // forward to a slow-to-commit page.
 IN_PROC_BROWSER_TEST_F(BrowserTest, ForwardDisabledOnForward) {
-  GURL blank_url(chrome::kAboutBlankURL);
+  GURL blank_url(content::kAboutBlankURL);
   ui_test_utils::NavigateToURL(browser(), blank_url);
 
   ui_test_utils::NavigateToURL(
@@ -1663,7 +1663,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) {
   EXPECT_EQ(1, app_browser->tab_strip_model()->count());
 
   // Now try opening another tab in the app browser.
-  AddTabWithURLParams params2(GURL(chrome::kAboutBlankURL),
+  AddTabWithURLParams params2(GURL(content::kAboutBlankURL),
                               content::PAGE_TRANSITION_TYPED);
   app_browser->AddTabWithURL(&params2);
   EXPECT_EQ(app_browser, params2.target);
@@ -1681,7 +1681,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) {
   EXPECT_EQ(1, app_popup_browser->tab_strip_model()->count());
 
   // Now try opening another tab in the app popup browser.
-  AddTabWithURLParams params3(GURL(chrome::kAboutBlankURL),
+  AddTabWithURLParams params3(GURL(content::kAboutBlankURL),
                               content::PAGE_TRANSITION_TYPED);
   app_popup_browser->AddTabWithURL(&params3);
   EXPECT_EQ(app_popup_browser, params3.target);
diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc
index 2f64af3..bbd7912 100644
--- a/chrome/browser/ui/browser_close_browsertest.cc
+++ b/chrome/browser/ui/browser_close_browsertest.cc
@@ -178,7 +178,7 @@ class BrowserCloseTest : public InProcessBrowserTest {
                                   chrome::HostDesktopType host_desktop_type) {
     Browser* new_browser =
         new Browser(Browser::CreateParams(profile, host_desktop_type));
-    chrome::AddSelectedTabWithURL(new_browser, GURL(chrome::kAboutBlankURL),
+    chrome::AddSelectedTabWithURL(new_browser, GURL(content::kAboutBlankURL),
                                   content::PAGE_TRANSITION_AUTO_TOPLEVEL);
     content::WaitForLoadStop(
         new_browser->tab_strip_model()->GetActiveWebContents());
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index 1f22006..ec434e6 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -843,7 +843,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabInitialFocus) {
   EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 
   // Open about:blank, focus should be on the location bar.
-  chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL),
+  chrome::AddSelectedTabWithURL(browser(), GURL(content::kAboutBlankURL),
                                 content::PAGE_TRANSITION_LINK);
   ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop(
       browser()->tab_strip_model()->GetActiveWebContents()));
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
index 7eb1c49..588b09e 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -162,7 +162,7 @@ void BrowserNavigatorTest::RunDoNothingIfIncognitoIsForcedTest(
   // The page should not be opened.
   EXPECT_EQ(browser, p.browser);
   EXPECT_EQ(1, browser->tab_strip_model()->count());
-  EXPECT_EQ(GURL(chrome::kAboutBlankURL),
+  EXPECT_EQ(GURL(content::kAboutBlankURL),
             browser->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
@@ -1052,7 +1052,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromBlankToOptionsInSameTab) {
   chrome::NavigateParams p(MakeNavigateParams());
-  p.url = GURL(chrome::kAboutBlankURL);
+  p.url = GURL(content::kAboutBlankURL);
   ui_test_utils::NavigateToURL(&p);
 
   {
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
index 93766dee1..874cb8a 100644
--- a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
@@ -96,9 +96,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, WebViewLayout) {
   [controller() setTopContentOffset:offset];
 
   SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
-  AddTabAtIndex(0,
-                GURL(chrome::kAboutBlankURL),
-                content::PAGE_TRANSITION_TYPED);
+  AddTabAtIndex(
+      0, GURL(content::kAboutBlankURL), content::PAGE_TRANSITION_TYPED);
   DevToolsWindow::ToggleDevToolsWindow(browser(), DEVTOOLS_TOGGLE_ACTION_SHOW);
 
   NSView* container_view = [[[controller() splitView] subviews] lastObject];
diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
index c2adc13..094667b 100644
--- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
+++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
@@ -62,7 +62,7 @@ class ViewIDTest : public InProcessBrowserTest {
         ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model);
 
       bookmark_utils::AddIfNotBookmarked(
-          bookmark_model, GURL(chrome::kAboutBlankURL), ASCIIToUTF16("about"));
+          bookmark_model, GURL(content::kAboutBlankURL), ASCIIToUTF16("about"));
     }
 
     for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) {
@@ -105,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) {
   for (int i = 1; i <= 9; ++i) {
     CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false);
     browser()->OpenURL(OpenURLParams(
-        GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB,
+        GURL(content::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB,
          content::PAGE_TRANSITION_TYPED, false));
     CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true);
     // VIEW_ID_TAB_LAST should always be available.
@@ -114,7 +114,7 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) {
 
   // Open the 11th tab.
   browser()->OpenURL(OpenURLParams(
-      GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB,
+      GURL(content::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB,
       content::PAGE_TRANSITION_TYPED, false));
   CheckViewID(VIEW_ID_TAB_LAST, true);
 }
diff --git a/chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc b/chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc
index 11dbf1a..59509d3 100644
--- a/chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc
+++ b/chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc
@@ -39,11 +39,11 @@ void AppMetroInfoBarDelegateWin::Create(
       profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // Create a new tab at about:blank, and add the infobar.
-  content::OpenURLParams params(
-      GURL(chrome::kAboutBlankURL),
-      content::Referrer(),
-      NEW_FOREGROUND_TAB,
-      content::PAGE_TRANSITION_LINK, false);
+  content::OpenURLParams params(GURL(content::kAboutBlankURL),
+                                content::Referrer(),
+                                NEW_FOREGROUND_TAB,
+                                content::PAGE_TRANSITION_LINK,
+                                false);
   content::WebContents* web_contents = browser->OpenURL(params);
   InfoBarService* info_bar_service =
       InfoBarService::FromWebContents(web_contents);
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index dbcf654..f77fe6a 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -1438,7 +1438,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_FitWindow) {
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  chrome::AddSelectedTabWithURL(popup, GURL(chrome::kAboutBlankURL),
+  chrome::AddSelectedTabWithURL(popup, GURL(content::kAboutBlankURL),
                                 content::PAGE_TRANSITION_LINK);
   // Wait for the page to finish loading.
   observer.Wait();
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc
index 940344e..30a8c20 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc
@@ -20,7 +20,7 @@
 #include "base/mac/mac_util.h"
 #endif
 
-using chrome::kAboutBlankURL;
+using content::kAboutBlankURL;
 using content::WebContents;
 using content::PAGE_TRANSITION_TYPED;
 
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
index 553e2c2..cfe3778 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
@@ -21,7 +21,7 @@
 #include "base/mac/mac_util.h"
 #endif
 
-using chrome::kAboutBlankURL;
+using content::kAboutBlankURL;
 using content::WebContents;
 using content::PAGE_TRANSITION_TYPED;
 
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
index 62adbd9..904c791 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
@@ -15,7 +15,7 @@
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using chrome::kAboutBlankURL;
+using content::kAboutBlankURL;
 using content::PAGE_TRANSITION_TYPED;
 
 // Interactive test fixture testing Fullscreen Controller through its states. --
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
index e3a89b5..24984be 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
@@ -347,7 +347,7 @@ Browser* FullscreenControllerStateUnitTest::GetBrowser() {
 
 #define TEST_EVENT(state, event) \
     TEST_F(FullscreenControllerStateUnitTest, state##__##event) { \
-      AddTab(browser(), GURL(chrome::kAboutBlankURL)); \
+      AddTab(browser(), GURL(content::kAboutBlankURL)); \
       ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \
           << GetAndClearDebugLog(); \
     }
@@ -366,7 +366,7 @@ Browser* FullscreenControllerStateUnitTest::GetBrowser() {
 // exist.
 TEST_F(FullscreenControllerStateUnitTest, TransitionsForEachState) {
   // A tab is needed for tab fullscreen.
-  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  AddTab(browser(), GURL(content::kAboutBlankURL));
   TestTransitionsForEachState();
   // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog();
 }
@@ -525,7 +525,7 @@ TEST_EVENT(STATE_TO_TAB_FULLSCREEN, WINDOW_CHANGE);
 TEST_F(FullscreenControllerStateUnitTest,
        DISABLED_ToggleTabWhenPendingBrowser) {
 #if !defined(OS_WIN)  // Only possible without reentrancy
-  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  AddTab(browser(), GURL(content::kAboutBlankURL));
   ASSERT_NO_FATAL_FAILURE(
       TransitionToState(STATE_TO_BROWSER_FULLSCREEN_NO_CHROME))
       << GetAndClearDebugLog();
@@ -540,7 +540,7 @@ TEST_F(FullscreenControllerStateUnitTest,
 // Browser fullscreen is broken currently http://crbug.com/154196
 TEST_F(FullscreenControllerStateUnitTest, DISABLED_ToggleTabWhenPendingTab) {
 #if !defined(OS_WIN)  // Only possible without reentrancy
-  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  AddTab(browser(), GURL(content::kAboutBlankURL));
   ASSERT_NO_FATAL_FAILURE(
       TransitionToState(STATE_TO_TAB_FULLSCREEN))
       << GetAndClearDebugLog();
@@ -587,7 +587,7 @@ TEST_F(FullscreenControllerStateUnitTest, DISABLED_DebugLogStateTables) {
 // This currently occurs when an extension exits fullscreen via changing the
 // browser bounds.
 TEST_F(FullscreenControllerStateUnitTest, ExitFullscreenViaBrowserWindow) {
-  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  AddTab(browser(), GURL(content::kAboutBlankURL));
   ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN));
   ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE));
   ASSERT_TRUE(browser()->window()->IsFullscreen());
diff --git a/chrome/browser/ui/gtk/view_id_util_browsertest.cc b/chrome/browser/ui/gtk/view_id_util_browsertest.cc
index 95f0a42..b3f1b03 100644
--- a/chrome/browser/ui/gtk/view_id_util_browsertest.cc
+++ b/chrome/browser/ui/gtk/view_id_util_browsertest.cc
@@ -58,7 +58,7 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) {
   CheckViewID(VIEW_ID_TAB_0, true);
   CheckViewID(VIEW_ID_TAB_1, false);
 
-  browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL),
+  browser()->OpenURL(OpenURLParams(GURL(content::kAboutBlankURL),
                      content::Referrer(),
                      NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED,
                      false));
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index c054f79..ef96886 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -1476,7 +1476,7 @@ metrics::OmniboxEventProto::PageClassification
   const std::string& url = gurl.spec();
   if (url == chrome::kChromeUINewTabURL)
     return metrics::OmniboxEventProto_PageClassification_NEW_TAB_PAGE;
-  if (url == chrome::kAboutBlankURL)
+  if (url == content::kAboutBlankURL)
     return metrics::OmniboxEventProto_PageClassification_BLANK;
   if (url == profile()->GetPrefs()->GetString(prefs::kHomePage))
     return metrics::OmniboxEventProto_PageClassification_HOMEPAGE;
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 9a259e6..5f46680 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -681,14 +681,14 @@ class OmniboxViewTest : public InProcessBrowserTest,
   }
 
   void BasicTextOperationsTest() {
-    ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+    ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
     chrome::FocusLocationBar(browser());
 
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     string16 old_text = omnibox_view->GetText();
-    EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), old_text);
+    EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), old_text);
     EXPECT_TRUE(omnibox_view->IsSelectAll());
 
     size_t start, end;
@@ -993,7 +993,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     model->SetDefaultSearchProvider(NULL);
 
-    ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+    ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
     chrome::FocusLocationBar(browser());
 
     OmniboxView* omnibox_view = NULL;
@@ -1465,14 +1465,14 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
 
 #if defined(TOOLKIT_GTK) || defined(USE_AURA)
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, UndoRedo) {
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   chrome::FocusLocationBar(browser());
 
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
   string16 old_text = omnibox_view->GetText();
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), old_text);
+  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), old_text);
   EXPECT_TRUE(omnibox_view->IsSelectAll());
 
   // Undo should clear the omnibox.
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 13c93b4..d0ee3db 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -1473,7 +1473,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
 
   // Create a panel with a non-extension host.
   CreatePanelParams params1(extension_app_name, gfx::Rect(), SHOW_AS_INACTIVE);
-  params1.url = GURL(chrome::kAboutBlankURL);
+  params1.url = GURL(content::kAboutBlankURL);
   Panel* panel1 = CreatePanelWithParams(params1);
   EXPECT_EQ(2, panel_manager->num_panels());
 
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index 09662bf..28589a3 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -1839,7 +1839,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest, TemporaryTextResetWhenPopupClosed) {
 
   // The omnibox should've reverted to the underlying permanent URL.
   EXPECT_FALSE(HasTemporaryText());
-  EXPECT_EQ(std::string(chrome::kAboutBlankURL), GetOmniboxText());
+  EXPECT_EQ(std::string(content::kAboutBlankURL), GetOmniboxText());
 }
 
 // Test that autocomplete results aren't sent when the popup is closed.
diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
index 3130ecf..6515cbe 100644
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -49,7 +49,7 @@ void ShowSingletonTabOverwritingNTP(Browser* browser,
   if (contents) {
     const GURL& contents_url = contents->GetURL();
     if ((contents_url == GURL(kChromeUINewTabURL) ||
-         contents_url == GURL(kAboutBlankURL)) &&
+         contents_url == GURL(content::kAboutBlankURL)) &&
         GetIndexOfSingletonTab(&local_params) < 0) {
       local_params.disposition = CURRENT_TAB;
     }
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index d1dafa8..46868e9 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -405,7 +405,7 @@ std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
           // command line. See ExistingUserController::OnLoginSuccess.
           (url.spec().find(chrome::kChromeUISettingsURL) == 0) ||
 #endif
-          (url.spec().compare(chrome::kAboutBlankURL) == 0)) {
+          (url.spec().compare(content::kAboutBlankURL) == 0)) {
         urls.push_back(url);
       }
     }
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index 05eb3a4..13bfe65 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -77,7 +77,7 @@ class StartupBrowserCreatorTest : public ExtensionBrowserTest {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePanels);
     command_line->AppendSwitchASCII(switches::kHomePage,
-                                    chrome::kAboutBlankURL);
+                                    content::kAboutBlankURL);
 #if defined(OS_CHROMEOS)
     // TODO(nkostylev): Investigate if we can remove this switch.
     command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests);
@@ -687,7 +687,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, UpdateWithTwoProfiles) {
   ASSERT_TRUE(new_browser);
   TabStripModel* tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
-  EXPECT_EQ(GURL(chrome::kAboutBlankURL),
+  EXPECT_EQ(GURL(content::kAboutBlankURL),
             tab_strip->GetWebContentsAt(0)->GetURL());
 
   ASSERT_EQ(1u, chrome::GetBrowserCount(profile2,
@@ -696,7 +696,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, UpdateWithTwoProfiles) {
   ASSERT_TRUE(new_browser);
   tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
-  EXPECT_EQ(GURL(chrome::kAboutBlankURL),
+  EXPECT_EQ(GURL(content::kAboutBlankURL),
             tab_strip->GetWebContentsAt(0)->GetURL());
 }
 
@@ -793,7 +793,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
   ASSERT_TRUE(new_browser);
   tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
-  EXPECT_EQ(GURL(chrome::kAboutBlankURL),
+  EXPECT_EQ(GURL(content::kAboutBlankURL),
             tab_strip->GetWebContentsAt(0)->GetURL());
 
   // profile_home2 was not launched since it would've only opened the home page.
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index d99403b..bf83f0e 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -144,7 +144,7 @@ GURL ToolbarModelImpl::GetURL() const {
       return ShouldDisplayURL() ? entry->GetVirtualURL() : GURL();
   }
 
-  return GURL(chrome::kAboutBlankURL);
+  return GURL(content::kAboutBlankURL);
 }
 
 ToolbarModel::SearchTermsType ToolbarModelImpl::GetSearchTermsType() const {
diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
index 11170f2..149805b 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
@@ -74,10 +74,10 @@ struct TestItem {
     false
   },
   {
-    GURL(chrome::kAboutBlankURL),
-    ASCIIToUTF16(chrome::kAboutBlankURL),
-    ASCIIToUTF16(chrome::kAboutBlankURL),
-    ASCIIToUTF16(chrome::kAboutBlankURL),
+    GURL(content::kAboutBlankURL),
+    ASCIIToUTF16(content::kAboutBlankURL),
+    ASCIIToUTF16(content::kAboutBlankURL),
+    ASCIIToUTF16(content::kAboutBlankURL),
     ToolbarModel::NO_SEARCH_TERMS,
     true
   },
@@ -187,7 +187,7 @@ class ToolbarModelTest : public BrowserWithTestWindowTest {
     chrome::EnableInstantExtendedAPIForTesting();
 
     ResetDefaultTemplateURL();
-    AddTab(browser(), GURL(chrome::kAboutBlankURL));
+    AddTab(browser(), GURL(content::kAboutBlankURL));
     for (size_t i = 0; i < queries.size(); ++i) {
       std::string url_string = kInstantExtendedPrefix +
           net::EscapeQueryParamValue(queries[i], true);
@@ -242,7 +242,7 @@ TEST_F(ToolbarModelTest, ShouldDisplayURLQueryExtractionDisabled) {
       << "This test expects query extraction to be disabled.";
 
   ResetDefaultTemplateURL();
-  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  AddTab(browser(), GURL(content::kAboutBlankURL));
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
@@ -258,7 +258,7 @@ TEST_F(ToolbarModelTest, ShouldDisplayURLQueryExtractionEnabled) {
   chrome::EnableInstantExtendedAPIForTesting();
 
   ResetDefaultTemplateURL();
-  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  AddTab(browser(), GURL(content::kAboutBlankURL));
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
@@ -330,7 +330,7 @@ TEST_F(ToolbarModelTest, SearchTermSecurityLevel) {
   chrome::EnableInstantExtendedAPIForTesting();
   browser()->toolbar_model()->SetSupportsExtractionOfURLLikeSearchTerms(true);
   ResetDefaultTemplateURL();
-  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  AddTab(browser(), GURL(content::kAboutBlankURL));
 
   WebContents* contents = browser()->tab_strip_model()->GetWebContentsAt(0);
   contents->GetController().LoadURL(
diff --git a/chrome/browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc
index ece7c06..d7284dd 100644
--- a/chrome/browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc
@@ -127,10 +127,10 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
   ASSERT_EQ(S_OK, hr);
   ASSERT_TRUE(NULL != acc_obj);
 
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
+  ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL));
   std::wstring title = UTF16ToWide(l10n_util::GetStringFUTF16(
       IDS_BROWSER_WINDOW_TITLE_FORMAT,
-      ASCIIToUTF16(chrome::kAboutBlankURL)));
+      ASCIIToUTF16(content::kAboutBlankURL)));
   TestAccessibilityInfo(acc_obj, title, ROLE_SYSTEM_WINDOW);
 }
 
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index fd26d01..43b770b 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -133,7 +133,7 @@ void UserImageScreenHandler::HandleGetImages() {
   if (screen_->selected_image() != User::kInvalidImageIndex)
     SelectImage(screen_->selected_image());
 
-  if (screen_->profile_picture_data_url() != chrome::kAboutBlankURL)
+  if (screen_->profile_picture_data_url() != content::kAboutBlankURL)
     SendProfileImage(screen_->profile_picture_data_url());
   else if (screen_->profile_picture_absent())
     OnProfileImageAbsent();
diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
index 678a1e9..aa742ca 100644
--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
@@ -73,7 +73,7 @@ const char kProfileDownloadReason[] = "Preferences";
 }  // namespace
 
 ChangePictureOptionsHandler::ChangePictureOptionsHandler()
-    : previous_image_url_(chrome::kAboutBlankURL),
+    : previous_image_url_(content::kAboutBlankURL),
       previous_image_index_(User::kInvalidImageIndex),
       weak_factory_(this) {
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
index cf65bef..9749e76 100644
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
@@ -79,7 +79,7 @@ TEST_F(WebDialogWebContentsDelegateTest, DoNothingMethodsTest) {
 
 TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) {
   test_web_contents_delegate_->OpenURLFromTab(
-    NULL, OpenURLParams(GURL(chrome::kAboutBlankURL), Referrer(),
+    NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(),
     NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
   // This should create a new foreground tab in the existing browser.
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
@@ -102,7 +102,7 @@ TEST_F(WebDialogWebContentsDelegateTest, DetachTest) {
   EXPECT_EQ(NULL, test_web_contents_delegate_->browser_context());
   // Now, none of the following calls should do anything.
   test_web_contents_delegate_->OpenURLFromTab(
-      NULL, OpenURLParams(GURL(chrome::kAboutBlankURL), Referrer(),
+      NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
   test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB,
                                               gfx::Rect(), false, NULL);
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index b718924..d48f2b6 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -190,7 +190,7 @@ void InProcessBrowserTest::PrepareTestCommandLine(CommandLine* command_line) {
     command_line->AppendSwitch(switches::kDisableZeroBrowsersOpenForTests);
 
   if (command_line->GetArgs().empty())
-    command_line->AppendArg(chrome::kAboutBlankURL);
+    command_line->AppendArg(content::kAboutBlankURL);
 }
 
 bool InProcessBrowserTest::CreateUserDataDirectory() {
@@ -283,7 +283,7 @@ void InProcessBrowserTest::AddBlankTabAndShow(Browser* browser) {
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  chrome::AddSelectedTabWithURL(browser, GURL(chrome::kAboutBlankURL),
+  chrome::AddSelectedTabWithURL(browser, GURL(content::kAboutBlankURL),
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   observer.Wait();
 
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index c2d3983b..a662087 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -1177,7 +1177,7 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) {
 
   // Make a new tab to cause the original one to hide, this should trigger the
   // next phase of the test.
-  chrome::NavigateParams params(browser(), GURL(chrome::kAboutBlankURL),
+  chrome::NavigateParams params(browser(), GURL(content::kAboutBlankURL),
                                 content::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   ui_test_utils::NavigateToURL(&params);
diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc
index 4654082..a44c274 100644
--- a/chrome/test/reliability/automated_ui_tests.cc
+++ b/chrome/test/reliability/automated_ui_tests.cc
@@ -410,7 +410,7 @@ bool AutomatedUITest::DoAction(const std::string& action) {
   } else if (LowerCaseEqualsASCII(action, "javascriptconsole")) {
     did_complete_action = JavaScriptConsole();
   } else if (LowerCaseEqualsASCII(action, "navigate")) {
-    std::string url = chrome::kAboutBlankURL;
+    std::string url = content::kAboutBlankURL;
     if (init_reader_.NodeAttribute("url", &url)) {
       xml_writer_.AddAttribute("url", url);
     }
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 2a3d56b..8521934 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -82,7 +82,7 @@ UITestBase::UITestBase()
     : launch_arguments_(CommandLine::NO_PROGRAM),
       expected_errors_(0),
       expected_crashes_(0),
-      homepage_(chrome::kAboutBlankURL),
+      homepage_(content::kAboutBlankURL),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc
index d4a5cc5..3753411 100644
--- a/chrome/test/webdriver/webdriver_automation.cc
+++ b/chrome/test/webdriver/webdriver_automation.cc
@@ -398,7 +398,7 @@ void Automation::Init(
   if (options.ignore_certificate_errors)
     command.AppendSwitch(switches::kIgnoreCertificateErrors);
   if (options.user_data_dir.empty())
-    command.AppendArg(chrome::kAboutBlankURL);
+    command.AppendArg(content::kAboutBlankURL);
 
   command.AppendArguments(options.command, true /* include_program */);