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

content/shell/browser/shell_javascript_dialog_manager.cc

 // Copyright 2013 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 "content/shell/browser/shell_javascript_dialog_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/web_contents.h"
 #include "content/shell/browser/blink_test_controller.h"
 #include "content/shell/browser/shell_javascript_dialog.h"
 #include "content/shell/common/shell_switches.h"
+#include "net/base/net_util.h"
 
 namespace content {
 
 ShellJavaScriptDialogManager::ShellJavaScriptDialogManager() {
 }
 
 ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() {
 }
 
 void ShellJavaScriptDialogManager::RunJavaScriptDialog(
@@ skipping 14 matching lines @@
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   *did_suppress_message = false;
 
   if (dialog_) {
     // One dialog at a time, please.
     *did_suppress_message = true;
     return;
   }
 
-  base::string16 new_message_text =
-      url_formatter::FormatUrl(origin_url, accept_lang) +
-      base::ASCIIToUTF16("\n\n") + message_text;
+  base::string16 new_message_text = net::FormatUrl(origin_url, accept_lang) +
+                              base::ASCIIToUTF16("\n\n") +
+                              message_text;
   gfx::NativeWindow parent_window = web_contents->GetTopLevelNativeWindow();
 
   dialog_.reset(new ShellJavaScriptDialog(this,
                                           parent_window,
                                           javascript_message_type,
                                           new_message_text,
                                           default_prompt_text,
                                           callback));
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
@@ skipping 58 matching lines @@
 void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
 }
 
 }  // namespace content