| Index: chrome/renderer/worker_content_settings_client_proxy.cc
|
| diff --git a/chrome/renderer/worker_content_settings_client_proxy.cc b/chrome/renderer/worker_content_settings_client_proxy.cc
|
| index 03054eede57a9fcdb67053ed8771d16ac9b7f85b..0056280db4c0b414dee4981fae750c37f41e47eb 100644
|
| --- a/chrome/renderer/worker_content_settings_client_proxy.cc
|
| +++ b/chrome/renderer/worker_content_settings_client_proxy.cc
|
| @@ -12,6 +12,7 @@
|
| #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
|
| #include "third_party/WebKit/public/web/WebDocument.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| +#include "url/origin.h"
|
|
|
| WorkerContentSettingsClientProxy::WorkerContentSettingsClientProxy(
|
| content::RenderFrame* render_frame,
|
| @@ -23,9 +24,9 @@ WorkerContentSettingsClientProxy::WorkerContentSettingsClientProxy(
|
| is_unique_origin_ = true;
|
| sync_message_filter_ = content::RenderThread::Get()->GetSyncMessageFilter();
|
| document_origin_url_ =
|
| - blink::WebStringToGURL(frame->document().getSecurityOrigin().toString());
|
| + url::Origin(frame->document().getSecurityOrigin()).GetURL();
|
| top_frame_origin_url_ =
|
| - blink::WebStringToGURL(frame->top()->getSecurityOrigin().toString());
|
| + url::Origin(frame->top()->getSecurityOrigin()).GetURL();
|
| }
|
|
|
| WorkerContentSettingsClientProxy::~WorkerContentSettingsClientProxy() {}
|
|
|