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

components/omnibox/browser/autocomplete_provider.cc

Index: components/omnibox/browser/autocomplete_provider.cc
diff --git a/components/omnibox/browser/autocomplete_provider.cc b/components/omnibox/browser/autocomplete_provider.cc
index 5072af2cbcaffff98a089d6fcac977d13f4bd00c..7c43ab41951160aad1726dc0aac42a4f9e384a8d 100644
--- a/components/omnibox/browser/autocomplete_provider.cc
+++ b/components/omnibox/browser/autocomplete_provider.cc
@@ -8,7 +8,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
-#include "components/url_formatter/url_fixer.h"
+#include "components/url_fixer/url_fixer.h"
 #include "net/base/net_util.h"
 #include "url/gurl.h"
 
@@ -102,7 +102,7 @@
 
   // Fixup and canonicalize user input.
   const GURL canonical_gurl(
-      url_formatter::FixupURL(base::UTF16ToUTF8(input_text), std::string()));
+      url_fixer::FixupURL(base::UTF16ToUTF8(input_text), std::string()));
   std::string canonical_gurl_str(canonical_gurl.possibly_invalid_spec());
   if (canonical_gurl_str.empty()) {
     // This probably won't happen, but there are no guarantees.