| 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 204e631a90d1ae58ae047178755b3abc4b73136b..d575ada115df15870fa07ecebe4de300c8b4c015 100644
|
| --- a/content/renderer/media/user_media_client_impl.cc
|
| +++ b/content/renderer/media/user_media_client_impl.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| +#include "content/public/child/url_conversion.h"
|
| #include "content/public/renderer/render_frame.h"
|
| #include "content/renderer/media/media_stream.h"
|
| #include "content/renderer/media/media_stream_audio_source.h"
|
| @@ -223,7 +224,8 @@ void UserMediaClientImpl::requestUserMedia(
|
| }
|
| CopyBlinkRequestToStreamControls(user_media_request, &controls);
|
|
|
| - security_origin = GURL(user_media_request.securityOrigin().toString());
|
| + security_origin =
|
| + WebStringToGURL(user_media_request.securityOrigin().toString());
|
| DCHECK(render_frame()->GetWebFrame() ==
|
| static_cast<blink::WebFrame*>(
|
| user_media_request.ownerDocument().frame()));
|
| @@ -302,8 +304,10 @@ void UserMediaClientImpl::requestMediaDevices(
|
| // underlying pointer is null). In order to use this function in a test we
|
| // need to check if it isNull.
|
| GURL security_origin;
|
| - if (!media_devices_request.isNull())
|
| - security_origin = GURL(media_devices_request.securityOrigin().toString());
|
| + if (!media_devices_request.isNull()) {
|
| + security_origin =
|
| + WebStringToGURL(media_devices_request.securityOrigin().toString());
|
| + }
|
|
|
| DVLOG(1) << "UserMediaClientImpl::requestMediaDevices("
|
| << audio_input_request_id
|
|
|