| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index fedd53caf15a4da66eece46d91d1c156f233c924..a45075139658964d24412ee7345171af8a8d8e28 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -782,7 +782,9 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
| if (is_nacl_mime_type || is_pnacl_mime_type) {
|
| // Normal NaCl/PNaCl embed. The app URL is the page URL.
|
| manifest_url = url;
|
| - app_url = frame->Top()->GetDocument().Url();
|
| + // TODO(lukasza, alexmos): https://crbug.com/728295: Don't assume
|
| + // that the top frame is local.
|
| + app_url = frame->Top()->ToWebLocalFrame()->GetDocument().Url();
|
| } else {
|
| // NaCl is being invoked as a content handler. Look up the NaCl
|
| // module using the MIME type. The app URL is the manifest URL.
|
| @@ -1367,9 +1369,8 @@ bool ChromeContentRendererClient::ShouldGatherSiteIsolationStats() const {
|
|
|
| std::unique_ptr<blink::WebContentSettingsClient>
|
| ChromeContentRendererClient::CreateWorkerContentSettingsClient(
|
| - content::RenderFrame* render_frame,
|
| - WebFrame* frame) {
|
| - return base::MakeUnique<WorkerContentSettingsClient>(render_frame, frame);
|
| + content::RenderFrame* render_frame) {
|
| + return base::MakeUnique<WorkerContentSettingsClient>(render_frame);
|
| }
|
|
|
| bool ChromeContentRendererClient::IsPluginAllowedToUseDevChannelAPIs() {
|
|
|