| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 35b472ad167ac9eeff39a1eae3a9638b2fdd528b..10aa77c702357905728917c57ee4f96d8b6d44e4 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -202,6 +202,7 @@
|
| #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
| #include "third_party/WebKit/public/web/WebWidget.h"
|
| +#include "url/origin.h"
|
| #include "url/url_constants.h"
|
| #include "url/url_util.h"
|
|
|
| @@ -2719,8 +2720,8 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
|
| &GetSharedMainThreadContext3D,
|
| RenderThreadImpl::current()->SharedMainThreadContextProvider());
|
|
|
| - scoped_refptr<media::MediaLog> media_log(new RenderMediaLog(
|
| - blink::WebStringToGURL(frame_->getSecurityOrigin().toString())));
|
| + scoped_refptr<media::MediaLog> media_log(
|
| + new RenderMediaLog(url::Origin(frame_->getSecurityOrigin()).GetURL()));
|
|
|
| #if defined(OS_ANDROID)
|
| if (UseWebMediaPlayerImpl(url) && !media_surface_manager_)
|
| @@ -4444,10 +4445,8 @@ void RenderFrameImpl::requestStorageQuota(
|
| return;
|
| }
|
| ChildThreadImpl::current()->quota_dispatcher()->RequestStorageQuota(
|
| - render_view_->GetRoutingID(),
|
| - blink::WebStringToGURL(origin.toString()),
|
| - static_cast<storage::StorageType>(type),
|
| - requested_size,
|
| + render_view_->GetRoutingID(), url::Origin(origin).GetURL(),
|
| + static_cast<storage::StorageType>(type), requested_size,
|
| QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
|
| }
|
|
|
| @@ -4530,8 +4529,7 @@ bool RenderFrameImpl::allowWebGL(bool default_value) {
|
|
|
| bool blocked = true;
|
| Send(new FrameHostMsg_Are3DAPIsBlocked(
|
| - routing_id_,
|
| - blink::WebStringToGURL(frame_->top()->getSecurityOrigin().toString()),
|
| + routing_id_, url::Origin(frame_->top()->getSecurityOrigin()).GetURL(),
|
| THREE_D_API_TYPE_WEBGL, &blocked));
|
| return !blocked;
|
| }
|
| @@ -5981,7 +5979,7 @@ WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream(
|
|
|
| return new WebMediaPlayerMS(
|
| frame_, client, GetWebMediaPlayerDelegate()->AsWeakPtr(),
|
| - new RenderMediaLog(blink::WebStringToGURL(security_origin.toString())),
|
| + new RenderMediaLog(url::Origin(security_origin).GetURL()),
|
| CreateRendererFactory(), compositor_task_runner,
|
| render_thread->GetMediaThreadTaskRunner(),
|
| render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories(),
|
|
|