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

chrome/browser/content_settings/permission_bubble_request_impl.cc

Index: chrome/browser/content_settings/permission_bubble_request_impl.cc
diff --git a/chrome/browser/content_settings/permission_bubble_request_impl.cc b/chrome/browser/content_settings/permission_bubble_request_impl.cc
index 3fc8bedca41c410a8afc0408c152e50cad27a36b..ea799b241fa66f8bd06d772034b18f4f62b9e27e 100644
--- a/chrome/browser/content_settings/permission_bubble_request_impl.cc
+++ b/chrome/browser/content_settings/permission_bubble_request_impl.cc
@@ -7,8 +7,8 @@
 #include "chrome/browser/content_settings/permission_context_base.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/url_formatter/url_formatter.h"
 #include "grit/theme_resources.h"
-#include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 PermissionBubbleRequestImpl::PermissionBubbleRequestImpl(
@@ -91,10 +91,11 @@ base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
   }
   return l10n_util::GetStringFUTF16(
       message_id,
-      net::FormatUrl(request_origin_, display_languages_,
-                     net::kFormatUrlOmitUsernamePassword |
-                     net::kFormatUrlOmitTrailingSlashOnBareHostname,
-                     net::UnescapeRule::SPACES, NULL, NULL, NULL));
+      url_formatter::FormatUrl(
+          request_origin_, display_languages_,
+          url_formatter::kFormatUrlOmitUsernamePassword |
+              url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname,
+          net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
 }
 
 base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {