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

content/renderer/media/remote_media_stream_impl.cc

 // Copyright (c) 2013 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/remote_media_stream_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 31 matching lines @@
 };
 
 }  // namespace content
 
 namespace {
 
 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track,
                            blink::WebMediaStreamTrack* webkit_track,
                            blink::WebMediaStreamSource::Type type) {
   blink::WebMediaStreamSource webkit_source;
-  blink::WebString webkit_track_id(UTF8ToUTF16(track->id()));
+  blink::WebString webkit_track_id(base::UTF8ToUTF16(track->id()));
 
   webkit_source.initialize(webkit_track_id, type, webkit_track_id);
   webkit_track->initialize(webkit_track_id, webkit_source);
   content::MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(
       track, *webkit_track, false);
 }
 
 content::RemoteMediaStreamTrackObserver* FindTrackObserver(
     webrtc::MediaStreamTrackInterface* track,
     const ScopedVector<content::RemoteMediaStreamTrackObserver>& observers) {
@@ skipping 80 matching lines @@
   for (i = 0; i < webrtc_video_tracks.size(); ++i) {
     webrtc::VideoTrackInterface* video_track = webrtc_video_tracks[i];
     DCHECK(video_track);
     InitializeWebkitTrack(video_track,  &webkit_video_tracks[i],
                           blink::WebMediaStreamSource::TypeVideo);
     video_track_observers_.push_back(
         new RemoteMediaStreamTrackObserver(video_track,
                                            webkit_video_tracks[i]));
   }
 
-  webkit_stream_.initialize(UTF8ToUTF16(webrtc_stream->label()),
+  webkit_stream_.initialize(base::UTF8ToUTF16(webrtc_stream->label()),
                             webkit_audio_tracks, webkit_video_tracks);
   webkit_stream_.setExtraData(new MediaStreamExtraData(webrtc_stream, false));
 }
 
 RemoteMediaStreamImpl::~RemoteMediaStreamImpl() {
   webrtc_stream_->UnregisterObserver(this);
 }
 
 void RemoteMediaStreamImpl::OnChanged() {
   // Find removed audio tracks.
@@ skipping 47 matching lines @@
       InitializeWebkitTrack(*it, &new_track,
                             blink::WebMediaStreamSource::TypeVideo);
       video_track_observers_.push_back(
           new RemoteMediaStreamTrackObserver(*it, new_track));
       webkit_stream_.addTrack(new_track);
     }
   }
 }
 
 }  // namespace content