Support "always allow" for runtime script execution

chrome/browser/extensions/permissions_updater.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/permissions_updater.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 126 matching lines @@
   if (!Manifest::IsUnpackedLocation(extension->location()) &&
       extension->location() != Manifest::INTERNAL)
     return;
 
   ExtensionPrefs::Get(browser_context_)->AddGrantedPermissions(
       extension->id(),
       extension->permissions_data()->active_permissions().get());
 }
 
 void PermissionsUpdater::InitializePermissions(const Extension* extension) {
+  ExtensionPrefs* prefs = ExtensionPrefs::Get(browser_context_);
   scoped_refptr<const PermissionSet> bounded_active =
-      GetBoundedActivePermissions(extension,
-                                  ExtensionPrefs::Get(browser_context_));
+      GetBoundedActivePermissions(extension, prefs);
 
   // We withhold permissions iff the switch to do so is enabled, the extension
   // shows up in chrome:extensions (so the user can grant withheld permissions),
   // the extension is not part of chrome or corporate policy, and also not on
   // the scripting whitelist. Additionally, we don't withhold if the extension
   // has the preference to allow scripting on all urls.
   bool should_withhold_permissions =
       FeatureSwitch::scripts_require_action()->IsEnabled() &&
       extension->ShouldDisplayInExtensionSettings() &&
       !Manifest::IsPolicyLocation(extension->location()) &&
       !Manifest::IsComponentLocation(extension->location()) &&
       !PermissionsData::CanExecuteScriptEverywhere(extension) &&
       !util::AllowedScriptingOnAllUrls(extension->id(), browser_context_);
 
   URLPatternSet granted_explicit_hosts;
   URLPatternSet withheld_explicit_hosts;
   SegregateUrlPermissions(bounded_active->explicit_hosts(),
                           should_withhold_permissions,
                           &granted_explicit_hosts,
                           &withheld_explicit_hosts);
 
   URLPatternSet granted_scriptable_hosts;
   URLPatternSet withheld_scriptable_hosts;
   SegregateUrlPermissions(bounded_active->scriptable_hosts(),
                           should_withhold_permissions,
                           &granted_scriptable_hosts,
                           &withheld_scriptable_hosts);
 
+  // Add persisted permissions to granted hosts.
+  PermissionSet* persisted = prefs->GetPersistedPermissions(extension->id());
+  if (persisted) {
+    const URLPatternSet& explicit_hosts = persisted->explicit_hosts();
+    for (URLPatternSet::const_iterator iter = explicit_hosts.begin();
+         iter != explicit_hosts.end();
+         ++iter) {
+      granted_explicit_hosts.AddPattern(*iter);
+    }
+    const URLPatternSet& scriptable_hosts = persisted->scriptable_hosts();
+    for (URLPatternSet::const_iterator iter = scriptable_hosts.begin();
+         iter != scriptable_hosts.end();
+         ++iter) {
+      granted_scriptable_hosts.AddPattern(*iter);
+    }
+  }
+
   bounded_active = new PermissionSet(bounded_active->apis(),
                                      bounded_active->manifest_permissions(),
                                      granted_explicit_hosts,
                                      granted_scriptable_hosts);
 
   scoped_refptr<const PermissionSet> withheld =
       new PermissionSet(APIPermissionSet(),
                         ManifestPermissionSet(),
                         withheld_explicit_hosts,
                         withheld_scriptable_hosts);
@@ skipping 133 matching lines @@
             Profile::FromBrowserContext(host->GetBrowserContext()))) {
       host->Send(new ExtensionMsg_UpdatePermissions(params));
     }
   }
 
   // Trigger the onAdded and onRemoved events in the extension.
   DispatchEvent(extension->id(), event_name, changed);
 }
 
 }  // namespace extensions