Componentize URLFixerUpper.

chrome/browser/autocomplete/autocomplete_input.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_input.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/common/net/url_fixer_upper.h"
+#include "components/url_fixer/url_fixer.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/url_canon_ip.h"
 #include "url/url_util.h"
 
 namespace {
 
 void AdjustCursorPositionIfNecessary(size_t num_leading_chars_removed,
                                      size_t* cursor_position) {
@@ skipping 118 matching lines @@
     return metrics::OmniboxInputType::FORCED_QUERY;
   }
 
   // Ask our parsing back-end to help us understand what the user typed.  We
   // use the URLFixerUpper here because we want to be smart about what we
   // consider a scheme.  For example, we shouldn't consider www.google.com:80
   // to have a scheme.
   url::Parsed local_parts;
   if (!parts)
     parts = &local_parts;
-  const base::string16 parsed_scheme(URLFixerUpper::SegmentURL(text, parts));
+  const base::string16 parsed_scheme(url_fixer::SegmentURL(text, parts));
   if (scheme)
     *scheme = parsed_scheme;
 
   // If we can't canonicalize the user's input, the rest of the autocomplete
   // system isn't going to be able to produce a navigable URL match for it.
   // So we just return QUERY immediately in these cases.
   GURL placeholder_canonicalized_url;
   if (!canonicalized_url)
     canonicalized_url = &placeholder_canonicalized_url;
-  *canonicalized_url = URLFixerUpper::FixupURL(base::UTF16ToUTF8(text),
-                                               base::UTF16ToUTF8(desired_tld));
+  *canonicalized_url = url_fixer::FixupURL(base::UTF16ToUTF8(text),
+                                           base::UTF16ToUTF8(desired_tld));
   if (!canonicalized_url->is_valid())
     return metrics::OmniboxInputType::QUERY;
 
   if (LowerCaseEqualsASCII(parsed_scheme, url::kFileScheme)) {
     // A user might or might not type a scheme when entering a file URL.  In
     // either case, |parsed_scheme| will tell us that this is a file URL, but
     // |parts->scheme| might be empty, e.g. if the user typed "C:\foo".
     return metrics::OmniboxInputType::URL;
   }
 
@@ skipping 62 matching lines @@
           url::Component* components[] = {
             &http_parts.username,
             &http_parts.password,
             &http_parts.host,
             &http_parts.port,
             &http_parts.path,
             &http_parts.query,
             &http_parts.ref,
           };
           for (size_t i = 0; i < arraysize(components); ++i) {
-            URLFixerUpper::OffsetComponent(
+            url_fixer::OffsetComponent(
                 -static_cast<int>(http_scheme_prefix.length()), components[i]);
           }
 
           *parts = http_parts;
           if (scheme)
             scheme->clear();
           *canonicalized_url = http_canonicalized_url;
 
           return metrics::OmniboxInputType::URL;
         }
@@ skipping 278 matching lines @@
   current_page_classification_ = AutocompleteInput::INVALID_SPEC;
   type_ = metrics::OmniboxInputType::INVALID;
   parts_ = url::Parsed();
   scheme_.clear();
   canonicalized_url_ = GURL();
   prevent_inline_autocomplete_ = false;
   prefer_keyword_ = false;
   allow_exact_keyword_match_ = false;
   want_asynchronous_matches_ = true;
 }