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

Unified Diff: content/renderer/media/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/media_stream_impl.cc
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index bc720205d8e7eb34fc961879956ea97a232bfcbb..c6dd9571e5f0ca2adb48d8ecbf56236272477d4b 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -226,7 +226,7 @@ MediaStreamImpl::GetVideoFrameProvider(
return NULL; // This is not a valid stream.
DVLOG(1) << "MediaStreamImpl::GetVideoFrameProvider stream:"
- << UTF16ToUTF8(web_stream.id());
+ << base::UTF16ToUTF8(web_stream.id());
blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
web_stream.videoTracks(video_tracks);
@@ -245,7 +245,7 @@ MediaStreamImpl::GetAudioRenderer(const GURL& url) {
return NULL; // This is not a valid stream.
DVLOG(1) << "MediaStreamImpl::GetAudioRenderer stream:"
- << UTF16ToUTF8(web_stream.id());
+ << base::UTF16ToUTF8(web_stream.id());
MediaStreamExtraData* extra_data =
static_cast<MediaStreamExtraData*>(web_stream.extraData());
@@ -350,7 +350,7 @@ void MediaStreamImpl::OnStreamGenerated(
request_info->frame,
video_source_vector);
blink::WebUserMediaRequest* request = &(request_info->request);
- blink::WebString webkit_id = UTF8ToUTF16(label);
+ blink::WebString webkit_id = base::UTF8ToUTF16(label);
blink::WebMediaStream* web_stream = &(request_info->web_stream);
blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector(
@@ -462,9 +462,9 @@ void MediaStreamImpl::CreateWebKitSourceVector(
continue;
}
webkit_sources[i].initialize(
- UTF8ToUTF16(devices[i].device.id),
+ base::UTF8ToUTF16(devices[i].device.id),
type,
- UTF8ToUTF16(devices[i].device.name));
+ base::UTF8ToUTF16(devices[i].device.name));
MediaStreamSourceExtraData* source_extra_data(
new content::MediaStreamSourceExtraData(
devices[i],
@@ -600,7 +600,7 @@ MediaStreamImpl::UserMediaRequestInfo*
MediaStreamImpl::FindUserMediaRequestInfo(const std::string& label) {
UserMediaRequests::iterator it = user_media_requests_.begin();
for (; it != user_media_requests_.end(); ++it) {
- if ((*it)->generated && (*it)->web_stream.id() == UTF8ToUTF16(label))
+ if ((*it)->generated && (*it)->web_stream.id() == base::UTF8ToUTF16(label))
return (*it);
}
return NULL;
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.cc ('k') | content/renderer/media/midi_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698