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

chrome/browser/pepper_broker_infobar_delegate.cc

Index: chrome/browser/pepper_broker_infobar_delegate.cc
diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc
index ca7a597103cfff550bb1da86c3e8fd1561b0fc20..0fa86d445394f751b1f4c99b441a1ef887d3e9b5 100644
--- a/chrome/browser/pepper_broker_infobar_delegate.cc
+++ b/chrome/browser/pepper_broker_infobar_delegate.cc
@@ -14,6 +14,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/infobars/core/infobar.h"
+#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
@@ -22,7 +23,6 @@
 #include "content/public/common/webplugininfo.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
-#include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
@@ -104,10 +104,9 @@ base::string16 PepperBrokerInfoBarDelegate::GetMessageText() const {
   DCHECK(success);
   scoped_ptr<PluginMetadata> plugin_metadata(
       PluginFinder::GetInstance()->GetPluginMetadata(plugin));
-  return l10n_util::GetStringFUTF16(IDS_PEPPER_BROKER_MESSAGE,
-                                    plugin_metadata->name(),
-                                    net::FormatUrl(url_.GetOrigin(),
-                                                   languages_));
+  return l10n_util::GetStringFUTF16(
+      IDS_PEPPER_BROKER_MESSAGE, plugin_metadata->name(),
+      url_formatter::FormatUrl(url_.GetOrigin(), languages_));
 }
 
 base::string16 PepperBrokerInfoBarDelegate::GetButtonLabel(