[Extensions] Un-refcount PermissionSet

chrome/common/extensions/permissions/chrome_permission_message_provider_unittest.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/common/extensions/permissions/chrome_permission_message_provider.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
@@ skipping 17 matching lines @@
 // chrome/browser/extensions/permission_messages_unittest.cc.
 class ChromePermissionMessageProviderUnittest : public testing::Test {
  public:
   ChromePermissionMessageProviderUnittest()
       : message_provider_(new ChromePermissionMessageProvider()) {}
   ~ChromePermissionMessageProviderUnittest() override {}
 
  protected:
   PermissionMessages GetMessages(const APIPermissionSet& permissions,
                                  Manifest::Type type) {
-    scoped_refptr<const PermissionSet> permission_set = new PermissionSet(
-        permissions, ManifestPermissionSet(), URLPatternSet(), URLPatternSet());
+    PermissionSet permission_set(permissions, ManifestPermissionSet(),
+                                 URLPatternSet(), URLPatternSet());
     return message_provider_->GetPermissionMessages(
-        message_provider_->GetAllPermissionIDs(permission_set.get(), type));
+        message_provider_->GetAllPermissionIDs(&permission_set, type));
   }
 
   bool IsPrivilegeIncrease(const APIPermissionSet& old_permissions,
                            const APIPermissionSet& new_permissions) {
-    scoped_refptr<PermissionSet> old_set(
-        new PermissionSet(old_permissions, ManifestPermissionSet(),
-                          URLPatternSet(), URLPatternSet()));
-    scoped_refptr<PermissionSet> new_set(
-        new PermissionSet(new_permissions, ManifestPermissionSet(),
-                          URLPatternSet(), URLPatternSet()));
-    return message_provider_->IsPrivilegeIncrease(old_set.get(), new_set.get(),
+    PermissionSet old_set(old_permissions, ManifestPermissionSet(),
+                          URLPatternSet(), URLPatternSet());
+    PermissionSet new_set(new_permissions, ManifestPermissionSet(),
+                          URLPatternSet(), URLPatternSet());
+    return message_provider_->IsPrivilegeIncrease(&old_set, &new_set,
                                                   Manifest::TYPE_EXTENSION);
   }
 
  private:
   scoped_ptr<ChromePermissionMessageProvider> message_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromePermissionMessageProviderUnittest);
 };
 
 // Checks that if an app has a superset and a subset permission, only the
@@ skipping 88 matching lines @@
 
   EXPECT_FALSE(IsPrivilegeIncrease(granted_permissions, actual_permissions));
 
   // Just to be safe: Adding the permission (with or without parameter) should
   // still be considered a privilege escalation.
   EXPECT_TRUE(IsPrivilegeIncrease(APIPermissionSet(), granted_permissions));
   EXPECT_TRUE(IsPrivilegeIncrease(APIPermissionSet(), actual_permissions));
 }
 
 }  // namespace extensions