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

chrome/browser/geolocation/geolocation_infobar_delegate.cc

Index: chrome/browser/geolocation/geolocation_infobar_delegate.cc
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
index 1b6eb2d002393bfda2738c488e6c65b218e2f714..52cf183b7af4541e0a331be909e9ad7d390094d8 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
@@ -7,9 +7,9 @@
 #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/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
@@ -44,9 +44,11 @@ int GeolocationInfoBarDelegate::GetIconID() const {
 }
 
 base::string16 GeolocationInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetStringFUTF16(IDS_GEOLOCATION_INFOBAR_QUESTION,
-      net::FormatUrl(requesting_frame_, display_languages_,
-                     net::kFormatUrlOmitUsernamePassword |
-                     net::kFormatUrlOmitTrailingSlashOnBareHostname,
-                     net::UnescapeRule::SPACES, NULL, NULL, NULL));
+  return l10n_util::GetStringFUTF16(
+      IDS_GEOLOCATION_INFOBAR_QUESTION,
+      url_formatter::FormatUrl(
+          requesting_frame_, display_languages_,
+          url_formatter::kFormatUrlOmitUsernamePassword |
+              url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname,
+          net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
 }