Use explicit WebString <-> string16 conversion methods in media files

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 <stddef.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 82 matching lines @@
       RemoteMediaStreamTrackAdapter<WebRtcMediaStreamTrackType>>;
 
   virtual ~RemoteMediaStreamTrackAdapter() {
     DCHECK(main_thread_->BelongsToCurrentThread());
   }
 
   void InitializeWebkitTrack(blink::WebMediaStreamSource::Type type) {
     DCHECK(main_thread_->BelongsToCurrentThread());
     DCHECK(webkit_track_.isNull());
 
-    blink::WebString webkit_track_id(base::UTF8ToUTF16(id_));
+    blink::WebString webkit_track_id(blink::WebString::fromUTF8(id_));
     blink::WebMediaStreamSource webkit_source;
     webkit_source.initialize(webkit_track_id, type, webkit_track_id,
                              true /* remote */);
     webkit_track_.initialize(webkit_track_id, webkit_source);
     DCHECK(!webkit_track_.isNull());
   }
 
   const scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
   // This callback will be run when Initialize() is called and then freed.
   // The callback is used by derived classes to bind objects that need to be
@@ skipping 248 matching lines @@
     webkit_audio_tracks[i] = *audio_track_observers_[i]->webkit_track();
   }
 
   blink::WebVector<blink::WebMediaStreamTrack> webkit_video_tracks(
         video_track_observers_.size());
   for (size_t i = 0; i < video_track_observers_.size(); ++i) {
     video_track_observers_[i]->Initialize();
     webkit_video_tracks[i] = *video_track_observers_[i]->webkit_track();
   }
 
-  webkit_stream_.initialize(base::UTF8ToUTF16(label),
+  webkit_stream_.initialize(blink::WebString::fromUTF8(label),
                             webkit_audio_tracks, webkit_video_tracks);
   webkit_stream_.setExtraData(new MediaStream());
 }
 
 void RemoteMediaStreamImpl::OnChanged(
     std::unique_ptr<RemoteAudioTrackAdapters> audio_tracks,
     std::unique_ptr<RemoteVideoTrackAdapters> video_tracks) {
   // Find removed tracks.
   auto audio_it = audio_track_observers_.begin();
   while (audio_it != audio_track_observers_.end()) {
@@ skipping 40 matching lines @@
   // Unregister all the audio track observers that were not used.
   // We need to do this before destruction since the observers can't unregister
   // from within the dtor due to a race.
   for (auto& track : *audio_tracks.get()) {
     if (track.get())
       track->Unregister();
   }
 }
 
 }  // namespace content