Make ActiveScriptController use Active Tab-style permissions

chrome/browser/extensions/active_script_controller.cc

Index: chrome/browser/extensions/active_script_controller.cc
diff --git a/chrome/browser/extensions/active_script_controller.cc b/chrome/browser/extensions/active_script_controller.cc
index a4dc3a551a6ee6be48086ac0d2f667f62b9551f0..4c7974d7c632052575d5be8bb23f371cbb18c72f 100644
--- a/chrome/browser/extensions/active_script_controller.cc
+++ b/chrome/browser/extensions/active_script_controller.cc
@@ -9,9 +9,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
+#include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
+#include "chrome/browser/sessions/session_id.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -70,8 +72,12 @@ ActiveScriptController* ActiveScriptController::GetForWebContents(
 bool ActiveScriptController::RequiresUserConsentForScriptInjection(
     const Extension* extension) {
   CHECK(extension);
-  if (!PermissionsData::RequiresActionForScriptExecution(extension))
+  if (!PermissionsData::RequiresActionForScriptExecution(
+          extension,
+          SessionID::IdForTab(web_contents()),
+          web_contents()->GetVisibleURL())) {
     return false;
+  }
 
   // If the feature is not enabled, we automatically allow all extensions to
   // run scripts.
@@ -161,6 +167,11 @@ LocationBarController::Action ActiveScriptController::OnClicked(
   iter->second.swap(requests);
   pending_requests_.erase(extension->id());
 
+  // Clicking to run the extension counts as granting it permission to run on
+  // the given tab.
+  TabHelper::FromWebContents(web_contents())->
+      active_tab_permission_granter()->GrantIfRequested(extension);
+
   // Run all pending injections for the given extension.
   for (PendingRequestList::iterator request = requests.begin();
        request != requests.end();