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

components/app_modal/javascript_dialog_manager.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 "components/app_modal/javascript_dialog_manager.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/app_modal/app_modal_dialog.h"
 #include "components/app_modal/app_modal_dialog_queue.h"
 #include "components/app_modal/javascript_dialog_extensions_client.h"
 #include "components/app_modal/javascript_native_dialog_factory.h"
 #include "components/app_modal/native_app_modal_dialog.h"
-#include "components/url_formatter/url_formatter.h"
 #include "content/public/common/javascript_message_type.h"
 #include "grit/components_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace app_modal {
 namespace {
 
 class DefaultExtensionsClient : public JavaScriptDialogExtensionsClient {
  public:
@@ skipping 177 matching lines @@
   }
 
   // For extensions, show the extension name, but only if the origin of
   // the alert matches the top-level WebContents.
   std::string name;
   if (extensions_client_->GetExtensionName(web_contents, origin_url, &name))
     return base::UTF8ToUTF16(name);
 
   // Otherwise, return the formatted URL.
   // In this case, force URL to have LTR directionality.
-  base::string16 url_string = url_formatter::FormatUrl(origin_url, accept_lang);
+  base::string16 url_string = net::FormatUrl(origin_url, accept_lang);
   return l10n_util::GetStringFUTF16(
       is_alert ? IDS_JAVASCRIPT_ALERT_TITLE
       : IDS_JAVASCRIPT_MESSAGEBOX_TITLE,
       base::i18n::GetDisplayStringInLTRDirectionality(url_string));
 }
 
 void JavaScriptDialogManager::CancelActiveAndPendingDialogs(
     content::WebContents* web_contents) {
   AppModalDialogQueue* queue = AppModalDialogQueue::GetInstance();
   AppModalDialog* active_dialog = queue->active_dialog();
@@ skipping 17 matching lines @@
     const base::string16& user_input) {
   // If an extension opened this dialog then the extension may shut down its
   // lazy background page after the dialog closes. (Dialogs are closed before
   // their WebContents is destroyed so |web_contents| is still valid here.)
   extensions_client_->OnDialogClosed(web_contents);
 
   callback.Run(success, user_input);
 }
 
 }  // namespace app_modal