[Extensions] Un-refcount PermissionSet

chrome/browser/extensions/permission_messages_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 "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
@@ skipping 60 matching lines @@
                         .Set("optional_permissions", optional_permissions))
                .SetID(crx_file::id_util::GenerateId("extension"))
                .SetLocation(Manifest::INTERNAL)
                .Build();
     env_.GetExtensionService()->AddExtension(app_.get());
   }
 
   // Returns the permission messages that would display in the prompt that
   // requests all the optional permissions for the current |app_|.
   std::vector<base::string16> GetOptionalPermissionMessages() {
-    scoped_refptr<const PermissionSet> granted_permissions =
+    scoped_ptr<const PermissionSet> granted_permissions =
         env_.GetExtensionPrefs()->GetGrantedPermissions(app_->id());
-    scoped_refptr<const PermissionSet> optional_permissions =
+    const PermissionSet* optional_permissions =
         PermissionsParser::GetOptionalPermissions(app_.get());
-    scoped_refptr<const PermissionSet> requested_permissions =
+    scoped_ptr<const PermissionSet> requested_permissions =
         PermissionSet::CreateDifference(*optional_permissions,
                                         *granted_permissions);
-    return GetMessages(requested_permissions);
+    return GetMessages(*requested_permissions);
   }
 
   void GrantOptionalPermissions() {
     PermissionsUpdater perms_updater(env_.profile());
     perms_updater.AddPermissions(
-        app_.get(),
-        PermissionsParser::GetOptionalPermissions(app_.get()).get());
+        app_.get(), PermissionsParser::GetOptionalPermissions(app_.get()));
   }
 
   std::vector<base::string16> active_permissions() {
-    return GetMessages(app_->permissions_data()->active_permissions());
+    return GetMessages(*app_->permissions_data()->active_permissions());
   }
 
   std::vector<base::string16> required_permissions() {
-    return GetMessages(PermissionsParser::GetRequiredPermissions(app_.get()));
+    return GetMessages(*PermissionsParser::GetRequiredPermissions(app_.get()));
   }
 
   std::vector<base::string16> optional_permissions() {
-    return GetMessages(PermissionsParser::GetOptionalPermissions(app_.get()));
+    return GetMessages(*PermissionsParser::GetOptionalPermissions(app_.get()));
   }
 
  private:
-  std::vector<base::string16> GetMessages(
-      scoped_refptr<const PermissionSet> permissions) {
+  std::vector<base::string16> GetMessages(const PermissionSet& permissions) {
     std::vector<base::string16> messages;
     for (const PermissionMessage& msg :
          message_provider_->GetPermissionMessages(
-             message_provider_->GetAllPermissionIDs(permissions.get(),
+             message_provider_->GetAllPermissionIDs(&permissions,
                                                     app_->GetType()))) {
       messages.push_back(msg.message());
     }
     return messages;
   }
 
   extensions::TestExtensionEnvironment env_;
   scoped_ptr<ChromePermissionMessageProvider> message_provider_;
   scoped_refptr<const Extension> app_;
 
@@ skipping 222 matching lines @@
   ASSERT_EQ(1U, messages.size());
   EXPECT_EQ(base::ASCIIToUTF16(kMessage), messages.front().message());
   const std::vector<base::string16>& submessages =
       messages.front().submessages();
   ASSERT_EQ(arraysize(kDetails), submessages.size());
   for (size_t i = 0; i < submessages.size(); i++)
     EXPECT_EQ(base::ASCIIToUTF16(kDetails[i]), submessages[i]);
 }
 
 }  // namespace extensions