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

chrome/browser/notifications/notification_permission_infobar_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/notifications/notification_permission_infobar_delegate.h"
 
 #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
 infobars::InfoBar* NotificationPermissionInfobarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const std::string& display_languages) {
   return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
@@ skipping 16 matching lines @@
 NotificationPermissionInfobarDelegate::~NotificationPermissionInfobarDelegate()
     {}
 
 int NotificationPermissionInfobarDelegate::GetIconID() const {
   return IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
 }
 
 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));
 }