Use a direct include of utf_string_conversions.h in content/.

content/shell/shell_javascript_dialog_manager.cc

 // Copyright (c) 2012 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/shell_javascript_dialog_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/shell_javascript_dialog.h"
 #include "content/shell/webkit_test_controller.h"
 #include "net/base/net_util.h"
 
 namespace content {
 
 ShellJavaScriptDialogManager::ShellJavaScriptDialogManager() {
@@ skipping 110 matching lines @@
 void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
 }
 
 }  // namespace content