1 files changed, 17 insertions, 15 deletions
diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc
index 1536ec3..08f71c0 100644
--- a/content/renderer/media/rtc_peer_connection_handler.cc
+++ b/content/renderer/media/rtc_peer_connection_handler.cc
@@ -121,7 +121,8 @@ CreateWebKitSessionDescription(
     return description;
   }
 
-  description.initialize(UTF8ToUTF16(native_desc->type()), UTF8ToUTF16(sdp));
+  description.initialize(base::UTF8ToUTF16(native_desc->type()),
+                         base::UTF8ToUTF16(sdp));
   return description;
 }
 
@@ -136,8 +137,8 @@ static void GetNativeIceServers(
     webrtc::PeerConnectionInterface::IceServer server;
     const blink::WebRTCICEServer& webkit_server =
         server_configuration.server(i);
-    server.username = UTF16ToUTF8(webkit_server.username());
-    server.password = UTF16ToUTF8(webkit_server.credential());
+    server.username = base::UTF16ToUTF8(webkit_server.username());
+    server.password = base::UTF16ToUTF8(webkit_server.credential());
     server.uri = webkit_server.uri().spec();
     servers->push_back(server);
   }
@@ -188,7 +189,7 @@ class CreateSessionDescriptionRequest
   }
   virtual void OnFailure(const std::string& error) OVERRIDE {
     tracker_.TrackOnFailure(error);
-    webkit_request_.requestFailed(UTF8ToUTF16(error));
+    webkit_request_.requestFailed(base::UTF8ToUTF16(error));
   }
 
  protected:
@@ -216,7 +217,7 @@ class SetSessionDescriptionRequest
   }
   virtual void OnFailure(const std::string& error) OVERRIDE {
     tracker_.TrackOnFailure(error);
-    webkit_request_.requestFailed(UTF8ToUTF16(error));
+    webkit_request_.requestFailed(base::UTF8ToUTF16(error));
   }
 
  protected:
@@ -507,9 +508,9 @@ bool RTCPeerConnectionHandler::addICECandidate(
     const blink::WebRTCICECandidate& candidate) {
   scoped_ptr<webrtc::IceCandidateInterface> native_candidate(
       dependency_factory_->CreateIceCandidate(
-          UTF16ToUTF8(candidate.sdpMid()),
+          base::UTF16ToUTF8(candidate.sdpMid()),
           candidate.sdpMLineIndex(),
-          UTF16ToUTF8(candidate.candidate())));
+          base::UTF16ToUTF8(candidate.candidate())));
   if (!native_candidate) {
     LOG(ERROR) << "Could not create native ICE candidate.";
     return false;
@@ -532,7 +533,7 @@ void RTCPeerConnectionHandler::OnaddICECandidateResult(
     // We don't have the actual error code from the libjingle, so for now
     // using a generic error string.
     return webkit_request.requestFailed(
-        UTF8ToUTF16("Error processing ICE candidate"));
+        base::UTF8ToUTF16("Error processing ICE candidate"));
   }
 
   return webkit_request.requestSucceeded();
@@ -607,7 +608,7 @@ void RTCPeerConnectionHandler::GetStats(
 
 blink::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel(
     const blink::WebString& label, const blink::WebRTCDataChannelInit& init) {
-  DVLOG(1) << "createDataChannel label " << UTF16ToUTF8(label);
+  DVLOG(1) << "createDataChannel label " << base::UTF16ToUTF8(label);
 
   webrtc::DataChannelInit config;
   // TODO(jiayl): remove the deprecated reliable field once Libjingle is updated
@@ -618,10 +619,11 @@ blink::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel(
   config.negotiated = init.negotiated;
   config.maxRetransmits = init.maxRetransmits;
   config.maxRetransmitTime = init.maxRetransmitTime;
-  config.protocol = UTF16ToUTF8(init.protocol);
+  config.protocol = base::UTF16ToUTF8(init.protocol);
 
   talk_base::scoped_refptr<webrtc::DataChannelInterface> webrtc_channel(
-      native_peer_connection_->CreateDataChannel(UTF16ToUTF8(label), &config));
+      native_peer_connection_->CreateDataChannel(base::UTF16ToUTF8(label),
+                                                 &config));
   if (!webrtc_channel) {
     DLOG(ERROR) << "Could not create native data channel.";
     return NULL;
@@ -756,8 +758,8 @@ void RTCPeerConnectionHandler::OnIceCandidate(
     return;
   }
   blink::WebRTCICECandidate web_candidate;
-  web_candidate.initialize(UTF8ToUTF16(sdp),
-                           UTF8ToUTF16(candidate->sdp_mid()),
+  web_candidate.initialize(base::UTF8ToUTF16(sdp),
+                           base::UTF8ToUTF16(candidate->sdp_mid()),
                            candidate->sdp_mline_index());
   if (peer_connection_tracker_)
     peer_connection_tracker_->TrackAddIceCandidate(
@@ -791,8 +793,8 @@ webrtc::SessionDescriptionInterface*
 RTCPeerConnectionHandler::CreateNativeSessionDescription(
     const blink::WebRTCSessionDescription& description,
     webrtc::SdpParseError* error) {
-  std::string sdp = UTF16ToUTF8(description.sdp());
-  std::string type = UTF16ToUTF8(description.type());
+  std::string sdp = base::UTF16ToUTF8(description.sdp());
+  std::string type = base::UTF16ToUTF8(description.type());
   webrtc::SessionDescriptionInterface* native_desc =
       dependency_factory_->CreateSessionDescription(type, sdp, error);