Componentize URLFixerUpper.

chrome/browser/autocomplete/autocomplete_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/autocomplete_provider.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "components/url_fixer/url_fixer.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "url/gurl.h"
 
 // static
 const size_t AutocompleteProvider::kMaxMatches = 3;
 
 AutocompleteProvider::AutocompleteProvider(
     AutocompleteProviderListener* listener,
     Profile* profile,
@@ skipping 106 matching lines @@
     i->starred = bookmark_model->IsBookmarked(i->destination_url);
 }
 
 // static
 AutocompleteProvider::FixupReturn AutocompleteProvider::FixupUserInput(
     const AutocompleteInput& input) {
   const base::string16& input_text = input.text();
   const FixupReturn failed(false, input_text);
 
   // Fixup and canonicalize user input.
-  const GURL canonical_gurl(URLFixerUpper::FixupURL(
-      base::UTF16ToUTF8(input_text), std::string()));
+  const GURL canonical_gurl(
+      url_fixer::FixupURL(base::UTF16ToUTF8(input_text), std::string()));
   std::string canonical_gurl_str(canonical_gurl.possibly_invalid_spec());
   if (canonical_gurl_str.empty()) {
     // This probably won't happen, but there are no guarantees.
     return failed;
   }
 
   // If the user types a number, GURL will convert it to a dotted quad.
   // However, if the parser did not mark this as a URL, then the user probably
   // didn't intend this interpretation.  Since this can break history matching
   // for hostname beginning with numbers (e.g. input of "17173" will be matched
@@ skipping 62 matching lines @@
 
   // Erase scheme plus up to two slashes.
   size_t prefix_end = scheme_pos + strlen(url::kHttpScheme) + 1;
   const size_t after_slashes = std::min(url->length(), prefix_end + 2);
   while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/'))
     ++prefix_end;
   url->erase(scheme_pos, prefix_end - scheme_pos);
   return (scheme_pos == 0) ? prefix_end : 0;
 }