Update uses of UTF conversions in content/ to use the base:: namespace.

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/strings/utf_string_conversions.h"
@@ skipping 12 matching lines @@
   DVLOG(1) << "::dtor";
   channel_->UnregisterObserver();
 }
 
 void RtcDataChannelHandler::setClient(
     blink::WebRTCDataChannelHandlerClient* client) {
   webkit_client_ = client;
 }
 
 blink::WebString RtcDataChannelHandler::label() {
-  return UTF8ToUTF16(channel_->label());
+  return base::UTF8ToUTF16(channel_->label());
 }
 
 bool RtcDataChannelHandler::isReliable() {
   return channel_->reliable();
 }
 
 bool RtcDataChannelHandler::ordered() const {
   return channel_->ordered();
 }
 
 unsigned short RtcDataChannelHandler::maxRetransmitTime() const {
   return channel_->maxRetransmitTime();
 }
 
 unsigned short RtcDataChannelHandler::maxRetransmits() const {
   return channel_->maxRetransmits();
 }
 
 blink::WebString RtcDataChannelHandler::protocol() const {
-  return UTF8ToUTF16(channel_->protocol());
+  return base::UTF8ToUTF16(channel_->protocol());
 }
 
 bool RtcDataChannelHandler::negotiated() const {
   return channel_->negotiated();
 }
 
 unsigned short RtcDataChannelHandler::id() const {
   return channel_->id();
 }
 
 unsigned long RtcDataChannelHandler::bufferedAmount() {
   return channel_->buffered_amount();
 }
 
 bool RtcDataChannelHandler::sendStringData(const blink::WebString& data) {
-  std::string utf8_buffer = UTF16ToUTF8(data);
+  std::string utf8_buffer = base::UTF16ToUTF8(data);
   talk_base::Buffer buffer(utf8_buffer.c_str(), utf8_buffer.length());
   webrtc::DataBuffer data_buffer(buffer, false);
   return channel_->Send(data_buffer);
 }
 
 bool RtcDataChannelHandler::sendRawData(const char* data, size_t length) {
   talk_base::Buffer buffer(data, length);
   webrtc::DataBuffer data_buffer(buffer, true);
   return channel_->Send(data_buffer);
 }
@@ skipping 34 matching lines @@
 void RtcDataChannelHandler::OnMessage(const webrtc::DataBuffer& buffer) {
   if (!webkit_client_) {
     LOG(ERROR) << "WebRTCDataChannelHandlerClient not set.";
     return;
   }
 
   if (buffer.binary) {
     webkit_client_->didReceiveRawData(buffer.data.data(), buffer.data.length());
   } else {
     base::string16 utf16;
-    if (!UTF8ToUTF16(buffer.data.data(), buffer.data.length(), &utf16)) {
+    if (!base::UTF8ToUTF16(buffer.data.data(), buffer.data.length(), &utf16)) {
       LOG(ERROR) << "Failed convert received data to UTF16";
       return;
     }
     webkit_client_->didReceiveStringData(utf16);
   }
 }
 
 }  // namespace content