Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 9ea32c42984c04e9f13f96ab843861983d9c65d7..54aa3fa9531698ad8640463c2803460294018dd4 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -57,6 +57,7 @@ |
#include "content/common/ssl_status_serialization.h" |
#include "content/common/swapped_out_messages.h" |
#include "content/common/view_messages.h" |
+#include "content/public/child/url_conversion.h" |
#include "content/public/common/bindings_policy.h" |
#include "content/public/common/browser_side_navigation_policy.h" |
#include "content/public/common/content_constants.h" |
@@ -2305,7 +2306,8 @@ blink::WebPlugin* RenderFrameImpl::createPlugin( |
std::string mime_type; |
bool found = false; |
WebString top_origin = frame->top()->securityOrigin().toString(); |
- Send(new FrameHostMsg_GetPluginInfo(routing_id_, params.url, GURL(top_origin), |
+ Send(new FrameHostMsg_GetPluginInfo(routing_id_, params.url, |
+ WebStringToGURL(top_origin), |
params.mimeType.utf8(), &found, &info, |
&mime_type)); |
if (!found) |
@@ -2811,8 +2813,8 @@ void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame, |
if (webview) { |
if (WebFrame* old_frame = webview->mainFrame()) { |
const WebURLRequest& original_request = datasource->originalRequest(); |
- const GURL referrer( |
- original_request.httpHeaderField(WebString::fromUTF8("Referer"))); |
+ const GURL referrer(WebStringToGURL( |
+ original_request.httpHeaderField(WebString::fromUTF8("Referer")))); |
if (!referrer.is_empty() && old_frame->isWebLocalFrame() && |
DocumentState::FromDataSource(old_frame->dataSource()) |
->was_prefetcher()) { |
@@ -3680,7 +3682,7 @@ void RenderFrameImpl::willSendRequest( |
extra_data->set_render_frame_id(routing_id_); |
extra_data->set_is_main_frame(!parent); |
extra_data->set_frame_origin( |
- GURL(frame->document().securityOrigin().toString())); |
+ WebStringToGURL(frame->document().securityOrigin().toString())); |
extra_data->set_parent_is_main_frame(parent && !parent->parent()); |
extra_data->set_parent_render_frame_id(parent_routing_id); |
extra_data->set_allow_download( |
@@ -3923,7 +3925,7 @@ void RenderFrameImpl::requestStorageQuota( |
} |
ChildThreadImpl::current()->quota_dispatcher()->RequestStorageQuota( |
render_view_->GetRoutingID(), |
- GURL(origin.toString()), |
+ WebStringToGURL(origin.toString()), |
static_cast<storage::StorageType>(type), |
requested_size, |
QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); |
@@ -4077,7 +4079,7 @@ bool RenderFrameImpl::allowWebGL(blink::WebLocalFrame* frame, |
bool blocked = true; |
Send(new FrameHostMsg_Are3DAPIsBlocked( |
routing_id_, |
- GURL(frame->top()->securityOrigin().toString()), |
+ WebStringToGURL(frame->top()->securityOrigin().toString()), |
THREE_D_API_TYPE_WEBGL, |
&blocked)); |
return !blocked; |
@@ -4087,7 +4089,7 @@ void RenderFrameImpl::didLoseWebGLContext(blink::WebLocalFrame* frame, |
int arb_robustness_status_code) { |
DCHECK(!frame_ || frame_ == frame); |
Send(new FrameHostMsg_DidLose3DContext( |
- GURL(frame->top()->securityOrigin().toString()), |
+ WebStringToGURL(frame->top()->securityOrigin().toString()), |
THREE_D_API_TYPE_WEBGL, |
arb_robustness_status_code)); |
} |