Move about://-related constants from //content to //url

chrome/browser/autocomplete/builtin_provider_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/builtin_provider.h"
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
@@ skipping 42 matching lines @@
   }
 
  private:
   scoped_refptr<BuiltinProvider> provider_;
 
   DISALLOW_COPY_AND_ASSIGN(BuiltinProviderTest);
 };
 
 #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(":/");
   const base::string16 kSeparator3 =
       ASCIIToUTF16(url::kStandardSchemeSeparator);
 
   // These default URLs should correspond with those in BuiltinProvider::Start.
   const GURL kURL1 = GURL(chrome::kChromeUIChromeURLsURL);
   const GURL kURL2 = GURL(chrome::kChromeUISettingsURL);
   const GURL kURL3 = GURL(chrome::kChromeUIVersionURL);
@@ skipping 26 matching lines @@
     {kChrome + kSeparator1,     3, {kURL1, kURL2, kURL3}},
     {kChrome + kSeparator2,     3, {kURL1, kURL2, kURL3}},
     {kChrome + kSeparator3,     3, {kURL1, kURL2, kURL3}},
     {ASCIIToUTF16("ChRoMe://"), 3, {kURL1, kURL2, kURL3}},
   };
 
   RunTest(typing_scheme_cases, arraysize(typing_scheme_cases));
 }
 #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(":/");
   const base::string16 kSeparator3 =
       ASCIIToUTF16(url::kStandardSchemeSeparator);
 
   // These default URLs should correspond with those in BuiltinProvider::Start.
   const GURL kURL1 = GURL(chrome::kChromeUIChromeURLsURL);
   const GURL kURL2 = GURL(chrome::kChromeUIVersionURL);
 
@@ skipping 44 matching lines @@
     {ASCIIToUTF16("scheme://"),                    0, {}},
     {ASCIIToUTF16("scheme://host"),                0, {}},
     {ASCIIToUTF16("scheme:host/path?query#ref"),   0, {}},
     {ASCIIToUTF16("scheme://host/path?query#ref"), 0, {}},
   };
 
   RunTest(non_chrome_url_cases, arraysize(non_chrome_url_cases));
 }
 
 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(":/");
   const base::string16 kSeparator3 =
       ASCIIToUTF16(url::kStandardSchemeSeparator);
 
   // This makes assumptions about the chrome URLs listed by the BuiltinProvider.
   // Currently they are derived from chrome::kChromeHostURLs[].
   const base::string16 kHostM1 =
       ASCIIToUTF16(content::kChromeUIMediaInternalsHost);
@@ skipping 32 matching lines @@
     {kChrome + kSeparator3 + kHostM2.substr(0, 3), 2, {kURLM2, kURLM3}},
     {kChrome + kSeparator3 + kHostM1,              1, {kURLM1}},
     {kChrome + kSeparator2 + kHostM2,              2, {kURLM2, kURLM3}},
     {kChrome + kSeparator2 + kHostM3,              1, {kURLM3}},
   };
 
   RunTest(chrome_url_cases, arraysize(chrome_url_cases));
 }
 
 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);
   const base::string16 kSeparator2 = ASCIIToUTF16(":///");
   const base::string16 kSeparator3 = ASCIIToUTF16(";///");
 
   const GURL kURLBlob = GURL(kChrome + kSeparator1 +
                              ASCIIToUTF16(content::kChromeUIBlobInternalsHost));
   const GURL kURLBlank = GURL(kAboutBlank);
 
@@ skipping 62 matching lines @@
     {kSettings + kPage1.substr(0, 1),                   2, {kURL1, kURL2}},
     {kSettings + kPage1.substr(0, 2),                   1, {kURL1}},
     {kSettings + kPage1.substr(0, kPage1.length() - 1), 1, {kURL1}},
     {kSettings + kPage1,                                1, {kURL1}},
     {kSettings + kPage2,                                1, {kURL2}},
   };
 
   RunTest(settings_subpage_cases, arraysize(settings_subpage_cases));
 }
 #endif