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

components/search_engines/template_url.cc

Index: components/search_engines/template_url.cc
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index 8241252ca3cf807ff564101959e3c28ce3054ea7..3ca7188a5fac03546d6e6686620fc26c15b9053c 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -25,7 +25,6 @@
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/search_engines/search_engines_switches.h"
 #include "components/search_engines/search_terms_data.h"
-#include "components/url_formatter/url_formatter.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/mime_util.h"
@@ -1218,7 +1217,7 @@
   // convert to Unicode using the user's accept-languages, so it won't look like
   // a confusing punycode string.
   base::string16 keyword =
-      net::StripWWW(url_formatter::IDNToUnicode(url.host(), accept_languages));
+      net::StripWWW(net::IDNToUnicode(url.host(), accept_languages));
   // Special case: if the host was exactly "www." (not sure this can happen but
   // perhaps with some weird intranet and custom DNS server?), ensure we at
   // least don't return the empty string.