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

chrome/browser/notifications/platform_notification_service_impl.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/platform_notification_service_impl.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #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"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/notifications/notifier_state_tracker_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/permissions/api_permission.h"
@@ skipping 347 matching lines @@
   if (origin.SchemeIsHTTPOrHTTPS()) {
     base::string16 formatted_origin;
     if (origin.SchemeIs(url::kHttpScheme)) {
       const url::Parsed& parsed = origin.parsed_for_possibly_invalid_spec();
       const std::string& spec = origin.possibly_invalid_spec();
       formatted_origin.append(
           spec.begin(),
           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()));
     }
     return formatted_origin;
   }
 
   // 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);
 }