Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Unified Diff: content/renderer/media/remote_media_stream_impl.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/remote_media_stream_impl.cc
diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc
index af430e242f73e553d1f345ea19287e1cfec516fe..339772827d94a76d308a9495acdec6d9f1df2f39 100644
--- a/content/renderer/media/remote_media_stream_impl.cc
+++ b/content/renderer/media/remote_media_stream_impl.cc
@@ -49,7 +49,7 @@ 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);
@@ -150,7 +150,7 @@ RemoteMediaStreamImpl::RemoteMediaStreamImpl(
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));
}
« no previous file with comments | « content/renderer/media/peer_connection_tracker.cc ('k') | content/renderer/media/rtc_data_channel_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698