Support "always allow" for runtime script execution

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 1b35b2872c9415706f9bd7585315856576cdc57b..f81bd4e2046617f02bb9f0bd93a38e783d8b8a97 100644
--- a/chrome/browser/extensions/active_script_controller.cc
+++ b/chrome/browser/extensions/active_script_controller.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
+#include "chrome/browser/extensions/permissions_updater.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"
@@ -20,12 +21,15 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest.h"
+#include "extensions/common/manifest_handlers/permissions_parser.h"
+#include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "ipc/ipc_message_macros.h"
 
@@ -100,6 +104,52 @@ void ActiveScriptController::OnAdInjectionDetected(
       ad_injectors.size() - num_preventable_ad_injectors);
 }
 
+void ActiveScriptController::AlwaysRunOnVisibleHost(
+    const Extension* extension) {
+  GURL url = web_contents()->GetVisibleURL();
+  extensions::URLPatternSet new_explicit_hosts;
+  extensions::URLPatternSet new_scriptable_hosts;
+
+  scoped_refptr<const PermissionSet> withheld_permissions =
+      extension->permissions_data()->withheld_permissions();
+  if (withheld_permissions->explicit_hosts().MatchesURL(url)) {
+    new_explicit_hosts.AddOrigin(
+        extensions::UserScript::ValidUserScriptSchemes(), url.GetOrigin());

[not at google - send to devlin, 2014/08/12 19:49:27]

don't need extensions:: here or below.

[gpdavis, 2014/08/12 21:19:54]

Done.

+  }
+  if (withheld_permissions->scriptable_hosts().MatchesURL(url)) {
+    new_scriptable_hosts.AddOrigin(
+        extensions::UserScript::ValidUserScriptSchemes(), url.GetOrigin());
+  }
+
+  scoped_refptr<extensions::PermissionSet> new_permissions =
+      new extensions::PermissionSet(extensions::APIPermissionSet(),
+                                    extensions::ManifestPermissionSet(),
+                                    new_explicit_hosts,
+                                    new_scriptable_hosts);
+
+  // Update permissions for the session. This adds |new_permissions| to active
+  // permissions and granted permissions.
+  extensions::PermissionsUpdater updater(web_contents()->GetBrowserContext());
+  updater.AddPermissions(extension, new_permissions.get());
+
+  URLPatternSet permissions_union;
+  URLPatternSet::CreateUnion(
+      withheld_permissions->scriptable_hosts(),
+      PermissionsParser::GetRequiredPermissions(extension)->scriptable_hosts(),
+      &permissions_union);
+  UMA_HISTOGRAM_COUNTS_100(
+      "Extensions.ActiveScriptController.AlwaysRunCount",
+      extension->permissions_data()->GetEffectiveHostPermissions().size() -
+          permissions_union.size());
+
+  // Allow current tab to run injection.
+  OnClicked(extension);
+}
+
+bool ActiveScriptController::HasActiveScriptAction(const Extension* extension) {
+  return enabled_ && active_script_actions_.count(extension->id()) > 0;
+}
+
 ExtensionAction* ActiveScriptController::GetActionForExtension(
     const Extension* extension) {
   if (!enabled_ || pending_requests_.count(extension->id()) == 0)