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

chrome/browser/autocomplete/history_quick_provider.cc

Index: chrome/browser/autocomplete/history_quick_provider.cc
diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc
index f4b4277ae53a2e7a3acad8db14233e6dc8d6b41d..33c00fe8a80adebd7800b72585c75e18323c7933 100644
--- a/chrome/browser/autocomplete/history_quick_provider.cc
+++ b/chrome/browser/autocomplete/history_quick_provider.cc
@@ -36,10 +36,10 @@
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
+#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "net/base/escape.h"
-#include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_util.h"
@@ -226,20 +226,21 @@ AutocompleteMatch HistoryQuickProvider::QuickMatchToACMatch(
   DCHECK(match.destination_url.is_valid());
 
   // Format the URL autocomplete presentation.
-  const net::FormatUrlTypes format_types = net::kFormatUrlOmitAll &
-      ~(!history_match.match_in_scheme ? 0 : net::kFormatUrlOmitHTTP);
+  const url_formatter::FormatUrlTypes format_types =
+      url_formatter::kFormatUrlOmitAll &
+      ~(!history_match.match_in_scheme ? 0 : url_formatter::kFormatUrlOmitHTTP);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(
-          info.url(),
-          net::FormatUrl(info.url(), languages_, format_types,
-                         net::UnescapeRule::SPACES, NULL, NULL, NULL),
+          info.url(), url_formatter::FormatUrl(
+                          info.url(), languages_, format_types,
+                          net::UnescapeRule::SPACES, nullptr, nullptr, nullptr),

[Peter Kasting, 2015/06/11 05:12:21]

Man, this formatting seems gross :/

           ChromeAutocompleteSchemeClassifier(profile_));
   std::vector<size_t> offsets =
       OffsetsFromTermMatches(history_match.url_matches);
   base::OffsetAdjuster::Adjustments adjustments;
-  match.contents = net::FormatUrlWithAdjustments(
-      info.url(), languages_, format_types, net::UnescapeRule::SPACES, NULL,
-      NULL, &adjustments);
+  match.contents = url_formatter::FormatUrlWithAdjustments(
+      info.url(), languages_, format_types, net::UnescapeRule::SPACES, nullptr,
+      nullptr, &adjustments);
   base::OffsetAdjuster::AdjustOffsets(adjustments, &offsets);
   TermMatches new_matches =
       ReplaceOffsetsInTermMatches(history_match.url_matches, offsets);