| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 7ca413ddeb9f0fc7e806b4dadf0cef5eddfc1e8d..d18ff39f3d37f814233217c63eab5f74cf47a0f8 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -170,6 +170,7 @@
|
| #include "ui/gfx/geometry/rect_conversions.h"
|
| #include "ui/gfx/geometry/size_conversions.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| +#include "url/origin.h"
|
| #include "url/url_constants.h"
|
| #include "v8/include/v8.h"
|
|
|
| @@ -1530,11 +1531,11 @@ WebView* RenderViewImpl::createView(WebLocalFrame* creator,
|
| params->opener_top_level_frame_url = creator->top()->document().url();
|
| } else {
|
| params->opener_top_level_frame_url =
|
| - blink::WebStringToGURL(creator->top()->getSecurityOrigin().toString());
|
| + url::Origin(creator->top()->getSecurityOrigin()).GetURL();
|
| }
|
|
|
| - GURL security_url(blink::WebStringToGURL(
|
| - creator->document().getSecurityOrigin().toString()));
|
| + GURL security_url(
|
| + url::Origin(creator->document().getSecurityOrigin()).GetURL());
|
| if (!security_url.is_valid())
|
| security_url = GURL();
|
| params->opener_security_origin = security_url;
|
|
|