[Extensions] Un-refcount PermissionSet

chrome/browser/extensions/active_script_controller.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 "chrome/browser/extensions/active_script_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
@@ skipping 71 matching lines @@
       "Extensions.ActiveScriptController.UnpreventableAdInjectors",
       ad_injectors.size() - num_preventable_ad_injectors);
 }
 
 void ActiveScriptController::AlwaysRunOnVisibleOrigin(
     const Extension* extension) {
   const GURL& url = web_contents()->GetVisibleURL();
   URLPatternSet new_explicit_hosts;
   URLPatternSet new_scriptable_hosts;
 
-  scoped_refptr<const PermissionSet> withheld_permissions =
+  const PermissionSet* withheld_permissions =
       extension->permissions_data()->withheld_permissions();
   if (withheld_permissions->explicit_hosts().MatchesURL(url)) {
     new_explicit_hosts.AddOrigin(UserScript::ValidUserScriptSchemes(),
                                  url.GetOrigin());
   }
   if (withheld_permissions->scriptable_hosts().MatchesURL(url)) {
     new_scriptable_hosts.AddOrigin(UserScript::ValidUserScriptSchemes(),
                                    url.GetOrigin());
   }
 
-  scoped_refptr<PermissionSet> new_permissions =
-      new PermissionSet(APIPermissionSet(),
-                        ManifestPermissionSet(),
-                        new_explicit_hosts,
-                        new_scriptable_hosts);
+  PermissionSet new_permissions(APIPermissionSet(), ManifestPermissionSet(),
+                                new_explicit_hosts, new_scriptable_hosts);
 
   // Update permissions for the session. This adds |new_permissions| to active
   // permissions and granted permissions.
   // TODO(devlin): Make sure that the permission is removed from
   // withheld_permissions if appropriate.
-  PermissionsUpdater(browser_context_).AddPermissions(extension,
-                                                      new_permissions.get());
+  PermissionsUpdater(browser_context_)
+      .AddPermissions(extension, &new_permissions);
 
   // Allow current tab to run injection.
   OnClicked(extension);
 }
 
 void ActiveScriptController::OnClicked(const Extension* extension) {
   DCHECK(ContainsKey(pending_requests_, extension->id()));
   RunPendingForExtension(extension);
 }
 
@@ skipping 99 matching lines @@
   // We shouldn't allow extensions which are no longer enabled to run any
   // scripts. Ignore the request.
   if (!extension)
     return;
 
   // If the request id is -1, that signals that the content script has already
   // ran (because this feature is not enabled). Add the extension to the list of
   // permitted extensions (for metrics), and return immediately.
   if (request_id == -1) {
     if (PermissionsData::ScriptsMayRequireActionForExtension(
-            extension,
-            extension->permissions_data()->active_permissions().get())) {
+            extension, extension->permissions_data()->active_permissions())) {
       permitted_extensions_.insert(extension->id());
     }
     return;
   }
 
   ++num_page_requests_;
 
   switch (RequiresUserConsentForScriptInjection(extension, script_type)) {
     case PermissionsData::ACCESS_ALLOWED:
       PermitScriptInjection(request_id);
@@ skipping 86 matching lines @@
     UnloadedExtensionInfo::Reason reason) {
   PendingRequestMap::iterator iter = pending_requests_.find(extension->id());
   if (iter != pending_requests_.end()) {
     pending_requests_.erase(iter);
     ExtensionActionAPI::Get(browser_context_)->
         NotifyPageActionsChanged(web_contents());
   }
 }
 
 }  // namespace extensions