[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 16 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));
   }
 
  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
 // superset permission message is displayed if they are both present.
@@ skipping 61 matching lines @@
       message0.message());
   EXPECT_TRUE(message0.submessages().empty());
   const PermissionMessage& message1 = *it++;
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST),
       message1.message());
   EXPECT_FALSE(message1.submessages().empty());
 }
 
 }  // namespace extensions