Move net::FormatUrl and friends outside of //net and into //components

components/omnibox/browser/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 "components/omnibox/browser/builtin_provider.h"
 
 #include <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_provider_client.h"
 #include "components/omnibox/browser/history_provider.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 
 const int BuiltinProvider::kRelevance = 860;
 
 BuiltinProvider::BuiltinProvider(AutocompleteProviderClient* client)
     : AutocompleteProvider(AutocompleteProvider::TYPE_BUILTIN),
       client_(client) {
   builtins_ = client_->GetBuiltinURLs();
 }
 
 void BuiltinProvider::Start(const AutocompleteInput& input,
@@ skipping 28 matching lines @@
     bool highlight = starting_about || text.length() > kAboutSchemeLength;
     styles.push_back(ACMatchClassification(0, highlight ? kMatch : kUrl));
     size_t offset = starting_about ? text.length() : embedderAbout.length();
     if (highlight)
       styles.push_back(ACMatchClassification(offset, kUrl));
     // Include some common builtin URLs as the user types the scheme.
     for (base::string16 url : client_->GetBuiltinsToProvideAsUserTypes())
       AddMatch(url, base::string16(), styles);
   } else {
     // Match input about: or |embedderAbout| URL input against builtin URLs.
-    GURL url = url_fixer::FixupURL(base::UTF16ToUTF8(text), std::string());
+    GURL url = url_formatter::FixupURL(base::UTF16ToUTF8(text), std::string());
     // BuiltinProvider doesn't know how to suggest valid ?query or #fragment
     // extensions to builtin URLs.
     if (url.SchemeIs(
             client_->GetEmbedderRepresentationOfAboutScheme().c_str()) &&
         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 (base::StartsWith(text, base::ASCIIToUTF16(url::kAboutScheme),
@@ skipping 52 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);
 }