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

chrome/browser/autocomplete/builtin_provider.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 <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 52 matching lines @@
 }
 
 void BuiltinProvider::Start(const AutocompleteInput& input,
                             bool minimal_changes) {
   matches_.clear();
   if ((input.type() == metrics::OmniboxInputType::INVALID) ||
       (input.type() == metrics::OmniboxInputType::FORCED_QUERY) ||
       (input.type() == metrics::OmniboxInputType::QUERY))
     return;
 
-  const size_t kAboutSchemeLength = strlen(content::kAboutScheme);
-  const base::string16 kAbout = base::ASCIIToUTF16(content::kAboutScheme) +
+  const size_t kAboutSchemeLength = strlen(url::kAboutScheme);
+  const base::string16 kAbout =
+      base::ASCIIToUTF16(url::kAboutScheme) +
       base::ASCIIToUTF16(url::kStandardSchemeSeparator);
   const base::string16 kChrome = base::ASCIIToUTF16(content::kChromeUIScheme) +
       base::ASCIIToUTF16(url::kStandardSchemeSeparator);
 
   const int kUrl = ACMatchClassification::URL;
   const int kMatch = kUrl | ACMatchClassification::MATCH;
 
   base::string16 text = input.text();
   bool starting_chrome = StartsWith(kChrome, text, false);
   if (starting_chrome || StartsWith(kAbout, text, false)) {
@@ skipping 18 matching lines @@
     // Match input about: or chrome: URL input against builtin chrome URLs.
     GURL url = URLFixerUpper::FixupURL(base::UTF16ToUTF8(text), std::string());
     // BuiltinProvider doesn't know how to suggest valid ?query or #fragment
     // extensions to chrome: URLs.
     if (url.SchemeIs(content::kChromeUIScheme) && url.has_host() &&
         !url.has_query() && !url.has_ref()) {
       // Suggest about:blank for substrings, taking URL fixup into account.
       // Chrome does not support trailing slashes or paths for about:blank.
       const base::string16 blank_host = base::ASCIIToUTF16("blank");
       const base::string16 host = base::UTF8ToUTF16(url.host());
-      if (StartsWith(text, base::ASCIIToUTF16(content::kAboutScheme), false) &&
+      if (StartsWith(text, base::ASCIIToUTF16(url::kAboutScheme), false) &&
           StartsWith(blank_host, host, false) && (url.path().length() <= 1) &&
           !EndsWith(text, base::ASCIIToUTF16("/"), false)) {
         ACMatchClassifications styles;
         styles.push_back(ACMatchClassification(0, kMatch));
-        base::string16 match = base::ASCIIToUTF16(content::kAboutBlankURL);
+        base::string16 match = base::ASCIIToUTF16(url::kAboutBlankURL);
         // Measure the length of the matching host after the "about:" scheme.
         const size_t corrected_length = kAboutSchemeLength + 1 + host.length();
         if (blank_host.length() > host.length())
           styles.push_back(ACMatchClassification(corrected_length, kUrl));
         AddMatch(match, match.substr(corrected_length), styles);
       }
 
       // Include the path for sub-pages (e.g. "chrome://settings/browser").
       base::string16 host_and_path = base::UTF8ToUTF16(url.host() + url.path());
       base::TrimString(host_and_path, base::ASCIIToUTF16("/"), &host_and_path);
@@ skipping 32 matching lines @@
                                const ACMatchClassifications& styles) {
   AutocompleteMatch match(this, kRelevance, false,
                           AutocompleteMatchType::NAVSUGGEST);
   match.fill_into_edit = match_string;
   match.inline_autocompletion = inline_completion;
   match.destination_url = GURL(match_string);
   match.contents = match_string;
   match.contents_class = styles;
   matches_.push_back(match);
 }