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

chrome/browser/notifications/platform_notification_service_impl.cc

Index: chrome/browser/notifications/platform_notification_service_impl.cc
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
index 407971d8934c41c69b40d31f11ea3709ee993e7e..63508b3e29baa9914c59d5139ee622d74085dd82 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -17,13 +17,13 @@
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
-#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
 #include "content/public/browser/platform_notification_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/platform_notification_data.h"
+#include "net/base/net_util.h"
 #include "ui/message_center/notifier_settings.h"
 #include "url/url_constants.h"
 
@@ -391,8 +391,7 @@
           spec.begin() +
               parsed.CountCharactersBefore(url::Parsed::USERNAME, true));
     }
-    formatted_origin.append(
-        url_formatter::IDNToUnicode(origin.host(), languages));
+    formatted_origin.append(net::IDNToUnicode(origin.host(), languages));
     if (origin.has_port()) {
       formatted_origin.push_back(':');
       formatted_origin.append(base::UTF8ToUTF16(origin.port()));
@@ -402,5 +401,5 @@
 
   // TODO(dewittj): Once file:// URLs are passed in to the origin
   // GURL here, begin returning the path as the display name.
-  return url_formatter::FormatUrl(origin, languages);
-}
+  return net::FormatUrl(origin, languages);
+}