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

components/omnibox/browser/autocomplete_match.cc

 // Copyright 2014 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/autocomplete_match.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/suggestion_answer.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
+#include "components/url_formatter/url_formatter.h"
 #include "grit/components_scaled_resources.h"
-#include "net/base/net_util.h"
 
 namespace {
 
 bool IsTrivialClassification(const ACMatchClassifications& classifications) {
   return classifications.empty() ||
       ((classifications.size() == 1) &&
        (classifications.back().style == ACMatchClassification::NONE));
 }
 
 // Returns true if one of the |terms_prefixed_by_http_or_https| matches the
 // beginning of the URL (sans scheme).  (Recall that
 // |terms_prefixed_by_http_or_https|, for the input "http://a b" will be
 // ["a"].)  This suggests that the user wants a particular URL with a scheme
 // in mind, hence the caller should not consider another URL like this one
 // but with a different scheme to be a duplicate.  |languages| is used to
 // format punycoded URLs to decide if they match.
 bool WordMatchesURLContent(
     const std::vector<base::string16>& terms_prefixed_by_http_or_https,
     const std::string& languages,
     const GURL& url) {
   size_t prefix_length =
       url.scheme().length() + strlen(url::kStandardSchemeSeparator);
   DCHECK_GE(url.spec().length(), prefix_length);
-  const base::string16& formatted_url = net::FormatUrl(
-      url, languages, net::kFormatUrlOmitNothing, net::UnescapeRule::NORMAL,
-      NULL, NULL, &prefix_length);
+  const base::string16& formatted_url = url_formatter::FormatUrl(
+      url, languages, url_formatter::kFormatUrlOmitNothing,
+      net::UnescapeRule::NORMAL, nullptr, nullptr, &prefix_length);
   if (prefix_length == base::string16::npos)
     return false;
   const base::string16& formatted_url_without_scheme =
       formatted_url.substr(prefix_length);
   for (const auto& term : terms_prefixed_by_http_or_https) {
     if (base::StartsWith(formatted_url_without_scheme, term,
                          base::CompareCase::SENSITIVE))
       return true;
   }
   return false;
@@ skipping 577 matching lines @@
         << " is unsorted in relation to last offset of " << last_offset
         << ". Provider: " << provider_name << ".";
     DCHECK_LT(i->offset, text.length())
         << " Classification of [" << i->offset << "," << text.length()
         << "] is out of bounds for \"" << text << "\". Provider: "
         << provider_name << ".";
     last_offset = i->offset;
   }
 }
 #endif