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

chrome/common/localized_error.cc

Index: chrome/common/localized_error.cc
diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc
index 070fcf60a545d8f484a60ed1d2b951d10854adaf..1f94167790da383593c23d56cfc3e7277f72e711 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -18,9 +18,9 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/error_page/common/error_page_params.h"
 #include "components/error_page/common/net_error_info.h"
-#include "components/url_formatter/url_formatter.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_util.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
@@ -554,9 +554,9 @@
     options.suggestions = SUGGEST_NONE;
   }
 
-  base::string16 failed_url_string(url_formatter::FormatUrl(
-      failed_url, accept_languages, url_formatter::kFormatUrlOmitNothing,
-      net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr));
+  base::string16 failed_url_string(net::FormatUrl(
+      failed_url, accept_languages, net::kFormatUrlOmitNothing,
+      net::UnescapeRule::NORMAL, NULL, NULL, NULL));
   // URLs are always LTR.
   if (base::i18n::IsRTL())
     base::i18n::WrapStringWithLTRFormatting(&failed_url_string);
@@ -593,8 +593,8 @@
         l10n_util::GetStringUTF16(options.summary_resource_id));
   }
   summary->SetString("failedUrl", failed_url_string);
-  summary->SetString("hostName", url_formatter::IDNToUnicode(failed_url.host(),
-                                                             accept_languages));
+  summary->SetString("hostName", net::IDNToUnicode(failed_url.host(),
+                                                   accept_languages));
   summary->SetString("productName",
                      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));