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

chrome/browser/autocomplete/autocomplete_browsertest.cc

Index: chrome/browser/autocomplete/autocomplete_browsertest.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_browsertest.cc	(revision 276109)
+++ chrome/browser/autocomplete/autocomplete_browsertest.cc	(working copy)
@@ -78,16 +78,14 @@
   OmniboxView* omnibox_view = location_bar->GetOmniboxView();
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-            omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
   // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across
   // platforms.
 
   location_bar->FocusLocation(true);
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-            omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
   EXPECT_TRUE(omnibox_view->IsSelectAll());
 
   omnibox_view->SetUserText(base::ASCIIToUTF16("chrome"));
@@ -99,16 +97,14 @@
   omnibox_view->RevertAll();
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-            omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 
   omnibox_view->SetUserText(base::ASCIIToUTF16("chrome"));
   location_bar->Revert();
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-            omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 }
 
@@ -161,8 +157,7 @@
   {
     location_bar->Revert();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-              omnibox_view->GetText());
+    EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
     EXPECT_FALSE(omnibox_view->IsSelectAll());
     const AutocompleteResult& result = autocomplete_controller->result();
     EXPECT_TRUE(result.empty()) << AutocompleteResultAsString(result);
@@ -182,20 +177,18 @@
   // and select all.
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* omnibox_view = location_bar->GetOmniboxView();
-  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-            omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
   omnibox_view->SetUserText(base::string16());
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  chrome::AddSelectedTabWithURL(browser(), GURL(content::kAboutBlankURL),
+  chrome::AddSelectedTabWithURL(browser(),
+                                GURL(url::kAboutBlankURL),
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   observer.Wait();
-  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-            omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
   chrome::CloseTab(browser());
-  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-            omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
   EXPECT_TRUE(omnibox_view->IsSelectAll());
 }
 
@@ -213,8 +206,7 @@
   // Focus search when omnibox is blank
   {
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
-              omnibox_view->GetText());
+    EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());