| Index: content/renderer/media/user_media_client_impl.cc
|
| diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc
|
| index 2381c460580c126d7733acfb87bcaf6e1a154aa6..a98afe494c98b5592142e42732c7cf9dd1785f4d 100644
|
| --- a/content/renderer/media/user_media_client_impl.cc
|
| +++ b/content/renderer/media/user_media_client_impl.cc
|
| @@ -469,7 +469,7 @@ void UserMediaClientImpl::OnStreamGenerated(
|
| CreateVideoTracks(video_array, video_constraints, &video_track_vector,
|
| request_info);
|
|
|
| - blink::WebString webkit_id = base::UTF8ToUTF16(label);
|
| + blink::WebString webkit_id = blink::WebString::fromUTF8(label);
|
| blink::WebMediaStream* web_stream = &(request_info->web_stream);
|
|
|
| web_stream->initialize(webkit_id, audio_track_vector,
|
| @@ -580,11 +580,9 @@ void UserMediaClientImpl::InitializeSourceObject(
|
| return;
|
| }
|
|
|
| - webkit_source->initialize(
|
| - base::UTF8ToUTF16(device.device.id),
|
| - type,
|
| - base::UTF8ToUTF16(device.device.name),
|
| - false /* remote */);
|
| + webkit_source->initialize(blink::WebString::fromUTF8(device.device.id), type,
|
| + blink::WebString::fromUTF8(device.device.name),
|
| + false /* remote */);
|
|
|
| DVLOG(1) << "Initialize source object :"
|
| << "id = " << webkit_source->id().utf8()
|
|
|