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

content/renderer/media/rtc_data_channel_handler.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/renderer/media/rtc_data_channel_handler.h"
 
 #include <string>
 
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace content {
 
 RtcDataChannelHandler::RtcDataChannelHandler(
     webrtc::DataChannelInterface* channel)
     : channel_(channel),
       webkit_client_(NULL) {
   DVLOG(1) << "::ctor";
   channel_->RegisterObserver(this);
 }
@@ skipping 78 matching lines @@
     string16 utf16;
     if (!UTF8ToUTF16(buffer.data.data(), buffer.data.length(), &utf16)) {
       LOG(ERROR) << "Failed convert received data to UTF16";
       return;
     }
     webkit_client_->didReceiveStringData(utf16);
   }
 }
 
 }  // namespace content