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

chrome/browser/notifications/notification_permission_infobar_delegate.cc

Index: chrome/browser/notifications/notification_permission_infobar_delegate.cc
diff --git a/chrome/browser/notifications/notification_permission_infobar_delegate.cc b/chrome/browser/notifications/notification_permission_infobar_delegate.cc
index 00316e2a0df65e431b04c601d4e38bb547061fa7..54ccf0bb7b32fff3ced4e4a3921e2a955dca9cd9 100644
--- a/chrome/browser/notifications/notification_permission_infobar_delegate.cc
+++ b/chrome/browser/notifications/notification_permission_infobar_delegate.cc
@@ -7,9 +7,8 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
-#include "components/url_formatter/url_formatter.h"
 #include "grit/theme_resources.h"
-#include "net/base/escape.h"
+#include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
@@ -46,9 +45,8 @@
 base::string16 NotificationPermissionInfobarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
       IDS_NOTIFICATION_PERMISSIONS,
-      url_formatter::FormatUrl(
-          requesting_frame_.GetOrigin(), display_languages_,
-          url_formatter::kFormatUrlOmitUsernamePassword |
-              url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname,
-          net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
+      net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_,
+                     net::kFormatUrlOmitUsernamePassword |
+                         net::kFormatUrlOmitTrailingSlashOnBareHostname,
+                     net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
 }