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

content/child/socket_stream_dispatcher.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/child/socket_stream_dispatcher.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/child/child_thread.h"
 #include "content/common/socket_stream.h"
 #include "content/common/socket_stream_handle_data.h"
 #include "content/common/socket_stream_messages.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
 #include "webkit/glue/websocketstreamhandle_delegate.h"
 
 namespace content {
@@ skipping 251 matching lines @@
 void SocketStreamDispatcher::OnFailed(int socket_id, int error_code) {
   IPCWebSocketStreamHandleBridge* bridge =
       IPCWebSocketStreamHandleBridge::FromSocketId(socket_id);
   if (bridge)
     bridge->OnFailed(error_code, net::ErrorToString(error_code));
   else
     DLOG(ERROR) << "No bridge for socket_id=" << socket_id;
 }
 
 }  // namespace content