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

chrome/browser/ui/toolbar/toolbar_model_impl.cc

Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index 0c2b041b78e45e4e2a047e179e8a61b4aed4b1b2..083b11b0ef5ac7cddc89b1cf3f02e71b2a4396f0 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -20,7 +20,6 @@
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
-#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -30,6 +29,7 @@
 #include "content/public/common/ssl_status.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/theme_resources.h"
+#include "net/base/net_util.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
@@ -68,9 +68,8 @@
   // and pastes it into another program, that program may think the URL ends at
   // the space.
   return AutocompleteInput::FormattedStringWithEquivalentMeaning(
-      url, url_formatter::FormatUrl(
-               url, languages, url_formatter::kFormatUrlOmitAll,
-               net::UnescapeRule::NORMAL, nullptr, prefix_end, nullptr),
+      url, net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
+                          net::UnescapeRule::NORMAL, NULL, prefix_end, NULL),
       ChromeAutocompleteSchemeClassifier(profile));
 }