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

components/omnibox/browser/builtin_provider.cc

Index: components/omnibox/browser/builtin_provider.cc
diff --git a/components/omnibox/browser/builtin_provider.cc b/components/omnibox/browser/builtin_provider.cc
index 6e3dde614582d62d5fdca78453b35b9bbba9f386..43e728b8eba022cad922352714c29bc810a5ccde 100644
--- a/components/omnibox/browser/builtin_provider.cc
+++ b/components/omnibox/browser/builtin_provider.cc
@@ -12,7 +12,7 @@
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_provider_client.h"
 #include "components/omnibox/browser/history_provider.h"
-#include "components/url_formatter/url_fixer.h"
+#include "components/url_fixer/url_fixer.h"
 
 const int BuiltinProvider::kRelevance = 860;
 
@@ -61,7 +61,7 @@
       AddMatch(url, base::string16(), styles);
   } else {
     // Match input about: or |embedderAbout| URL input against builtin URLs.
-    GURL url = url_formatter::FixupURL(base::UTF16ToUTF8(text), std::string());
+    GURL url = url_fixer::FixupURL(base::UTF16ToUTF8(text), std::string());
     // BuiltinProvider doesn't know how to suggest valid ?query or #fragment
     // extensions to builtin URLs.
     if (url.SchemeIs(