Componentize URLFixerUpper.

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"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/history_provider.h"
-#include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/url_constants.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
+#include "components/url_fixer/url_fixer.h"
 
 namespace {
 
 #if !defined(OS_ANDROID)
 // This list should be kept in sync with chrome/common/url_constants.h.
 // Only include useful sub-pages, confirmation alerts are not useful.
 const char* const kChromeSettingsSubPages[] = {
   chrome::kAutofillSubPage,
   chrome::kClearBrowserDataSubPage,
   chrome::kContentSettingsSubPage,
@@ skipping 69 matching lines @@
     AddMatch(base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL),
              base::string16(), styles);
 #if !defined(OS_ANDROID)
     AddMatch(base::ASCIIToUTF16(chrome::kChromeUISettingsURL),
              base::string16(), styles);
 #endif
     AddMatch(base::ASCIIToUTF16(chrome::kChromeUIVersionURL),
              base::string16(), styles);
   } else {
     // Match input about: or chrome: URL input against builtin chrome URLs.
-    GURL url = URLFixerUpper::FixupURL(base::UTF16ToUTF8(text), std::string());
+    GURL url = url_fixer::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(url::kAboutScheme), false) &&
           StartsWith(blank_host, host, false) && (url.path().length() <= 1) &&
@@ skipping 46 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);
 }