[Extensions] Use document url (not top url) for tab-specific permissions

extensions/renderer/programmatic_script_injector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/programmatic_script_injector.h"
 
 #include <vector>
 
 #include "base/values.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/renderer/injection_host.h"
 #include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
@@ skipping 38 matching lines @@
 }
 
 bool ProgrammaticScriptInjector::ShouldInjectCss(
     UserScript::RunLocation run_location) const {
   return GetRunLocation() == run_location && !params_->is_javascript;
 }
 
 PermissionsData::AccessType ProgrammaticScriptInjector::CanExecuteOnFrame(
     const InjectionHost* injection_host,
     blink::WebFrame* frame,
-    int tab_id,
-    const GURL& top_url) const {
+    int tab_id) const {
   // It doesn't make sense to inject a script into a remote frame or a frame
   // with a null document.
   if (frame->isWebRemoteFrame() || frame->document().isNull())
     return PermissionsData::ACCESS_DENIED;
   GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
       frame, frame->document().url(), params_->match_about_blank);
   if (params_->is_web_view) {
     if (frame->parent()) {
       // This is a subframe inside <webview>, so allow it.
       return PermissionsData::ACCESS_ALLOWED;
     }
 
     return effective_document_url == params_->webview_src
                ? PermissionsData::ACCESS_ALLOWED
                : PermissionsData::ACCESS_DENIED;
   }
   DCHECK_EQ(injection_host->id().type(), HostID::EXTENSIONS);
 
   return injection_host->CanExecuteOnFrame(
-      effective_document_url, top_url, tab_id, true /* is_declarative */);
+      effective_document_url,
+      content::RenderFrame::FromWebFrame(frame),
+      tab_id,
+      true /* is_declarative */);
 }
 
 std::vector<blink::WebScriptSource> ProgrammaticScriptInjector::GetJsSources(
     UserScript::RunLocation run_location) const {
   DCHECK_EQ(GetRunLocation(), run_location);
   DCHECK(params_->is_javascript);
 
   return std::vector<blink::WebScriptSource>(
       1,
       blink::WebScriptSource(
@@ skipping 52 matching lines @@
 
   render_view_->Send(new ExtensionHostMsg_ExecuteCodeFinished(
       render_view_->GetRoutingID(),
       params_->request_id,
       error,
       url_,
       results_));
 }
 
 }  // namespace extensions