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

components/omnibox/browser/autocomplete_input.cc

Index: components/omnibox/browser/autocomplete_input.cc
diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
index d5e10f5b5824cbc644fa52ac46ee00aec928348a..c8b744a5ec4872992ff70408d7938765ce94215a 100644
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -10,8 +10,7 @@
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_scheme_classifier.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
-#include "components/url_formatter/url_fixer.h"
-#include "components/url_formatter/url_formatter.h"
+#include "components/url_fixer/url_fixer.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/url_canon_ip.h"
@@ -189,7 +188,7 @@
   url::Parsed local_parts;
   if (!parts)
     parts = &local_parts;
-  const base::string16 parsed_scheme(url_formatter::SegmentURL(text, parts));
+  const base::string16 parsed_scheme(url_fixer::SegmentURL(text, parts));
   if (scheme)
     *scheme = parsed_scheme;
   const std::string parsed_scheme_utf8(base::UTF16ToUTF8(parsed_scheme));
@@ -201,7 +200,7 @@
   if (!canonicalized_url)
     canonicalized_url = &placeholder_canonicalized_url;
   *canonicalized_url =
-      url_formatter::FixupURL(base::UTF16ToUTF8(text), desired_tld);
+      url_fixer::FixupURL(base::UTF16ToUTF8(text), desired_tld);
   if (!canonicalized_url->is_valid())
     return metrics::OmniboxInputType::QUERY;
 
@@ -256,7 +255,7 @@
         &http_parts.ref,
       };
       for (size_t i = 0; i < arraysize(components); ++i) {
-        url_formatter::OffsetComponent(
+        url_fixer::OffsetComponent(
             -static_cast<int>(http_scheme_prefix.length()), components[i]);
       }
 
@@ -505,7 +504,7 @@
     const GURL& url,
     const base::string16& formatted_url,
     const AutocompleteSchemeClassifier& scheme_classifier) {
-  if (!url_formatter::CanStripTrailingSlash(url))
+  if (!net::CanStripTrailingSlash(url))
     return formatted_url;
   const base::string16 url_with_path(formatted_url + base::char16('/'));
   return (AutocompleteInput::Parse(formatted_url, std::string(),