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

chrome/browser/autocomplete/builtin_provider_unittest.cc

Index: chrome/browser/autocomplete/builtin_provider_unittest.cc
===================================================================
--- chrome/browser/autocomplete/builtin_provider_unittest.cc	(revision 276109)
+++ chrome/browser/autocomplete/builtin_provider_unittest.cc	(working copy)
@@ -60,7 +60,7 @@
 
 #if !defined(OS_ANDROID)
 TEST_F(BuiltinProviderTest, TypingScheme) {
-  const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
+  const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
   const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
   const base::string16 kSeparator1 = ASCIIToUTF16(":");
   const base::string16 kSeparator2 = ASCIIToUTF16(":/");
@@ -107,7 +107,7 @@
 }
 #else // Android uses a subset of the URLs
 TEST_F(BuiltinProviderTest, TypingScheme) {
-  const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
+  const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
   const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
   const base::string16 kSeparator1 = ASCIIToUTF16(":");
   const base::string16 kSeparator2 = ASCIIToUTF16(":/");
@@ -172,7 +172,7 @@
 }
 
 TEST_F(BuiltinProviderTest, ChromeURLs) {
-  const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
+  const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
   const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
   const base::string16 kSeparator1 = ASCIIToUTF16(":");
   const base::string16 kSeparator2 = ASCIIToUTF16(":/");
@@ -225,9 +225,9 @@
 }
 
 TEST_F(BuiltinProviderTest, AboutBlank) {
-  const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
+  const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
   const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
-  const base::string16 kAboutBlank = ASCIIToUTF16(content::kAboutBlankURL);
+  const base::string16 kAboutBlank = ASCIIToUTF16(url::kAboutBlankURL);
   const base::string16 kBlank = ASCIIToUTF16("blank");
   const base::string16 kSeparator1 =
       ASCIIToUTF16(url::kStandardSchemeSeparator);