| Index: content/browser/renderer_host/media/media_stream_ui_proxy.cc
|
| diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy.cc b/content/browser/renderer_host/media/media_stream_ui_proxy.cc
|
| index 9997a76e3e93b0cc7a68669276d50c02277ff91e..051a6471268eaaf35840338548e474121157031c 100644
|
| --- a/content/browser/renderer_host/media/media_stream_ui_proxy.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_ui_proxy.cc
|
| @@ -19,14 +19,6 @@
|
|
|
| namespace content {
|
|
|
| -namespace {
|
| -
|
| -GURL ConvertToGURL(const url::Origin& origin) {
|
| - return origin.unique() ? GURL() : GURL(origin.Serialize());
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| void SetAndCheckAncestorFlag(MediaStreamRequest* request) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| RenderFrameHostImpl* rfh =
|
| @@ -213,7 +205,7 @@ void MediaStreamUIProxy::CheckAccess(
|
| BrowserThread::PostTaskAndReplyWithResult(
|
| BrowserThread::UI, FROM_HERE,
|
| base::Bind(&Core::CheckAccess, base::Unretained(core_.get()),
|
| - ConvertToGURL(security_origin), type, render_process_id,
|
| + security_origin.GetURL(), type, render_process_id,
|
| render_frame_id),
|
| base::Bind(&MediaStreamUIProxy::OnCheckedAccess,
|
| weak_factory_.GetWeakPtr(), callback));
|
|
|