Extensions-related fixups for scoped_refptr conversion operator removal.

extensions/common/extension_messages.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 "extensions/common/extension_messages.h"
 
 #include "content/public/common/common_param_traits.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/permissions/permissions_info.h"
 
 using extensions::APIPermission;
 using extensions::APIPermissionInfo;
 using extensions::APIPermissionSet;
 using extensions::Extension;
 using extensions::Manifest;
 using extensions::ManifestHandler;
 using extensions::ManifestPermission;
 using extensions::ManifestPermissionSet;
 using extensions::PermissionSet;
 using extensions::URLPatternSet;
 
 ExtensionMsg_PermissionSetStruct::ExtensionMsg_PermissionSetStruct() {
 }
 
 ExtensionMsg_PermissionSetStruct::ExtensionMsg_PermissionSetStruct(
-    const PermissionSet* permissions)
-    : apis(permissions->apis()),
-      manifest_permissions(permissions->manifest_permissions()),
-      explicit_hosts(permissions->explicit_hosts()),
-      scriptable_hosts(permissions->scriptable_hosts()) {
+    const PermissionSet& permissions)
+    : apis(permissions.apis()),
+      manifest_permissions(permissions.manifest_permissions()),
+      explicit_hosts(permissions.explicit_hosts()),
+      scriptable_hosts(permissions.scriptable_hosts()) {
 }
 
 ExtensionMsg_PermissionSetStruct::~ExtensionMsg_PermissionSetStruct() {
 }
 
 scoped_refptr<const PermissionSet>
 ExtensionMsg_PermissionSetStruct::ToPermissionSet() const {
   return new PermissionSet(
       apis, manifest_permissions, explicit_hosts, scriptable_hosts);
 }
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params()
     : location(Manifest::INVALID_LOCATION),
       creation_flags(Extension::NO_FLAGS) {}
 
 ExtensionMsg_Loaded_Params::~ExtensionMsg_Loaded_Params() {}
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
     const Extension* extension)
     : manifest(extension->manifest()->value()->DeepCopy()),
       location(extension->location()),
       path(extension->path()),
-      active_permissions(extension->permissions_data()->active_permissions()),
+      active_permissions(*extension->permissions_data()->active_permissions()),
       withheld_permissions(
-          extension->permissions_data()->withheld_permissions()),
+          *extension->permissions_data()->withheld_permissions()),
       id(extension->id()),
       creation_flags(extension->creation_flags()) {
 }
 
 scoped_refptr<Extension> ExtensionMsg_Loaded_Params::ConvertToExtension(
     std::string* error) const {
   scoped_refptr<Extension> extension =
       Extension::Create(path, location, *manifest, creation_flags, error);
   if (extension.get()) {
     extension->permissions_data()->SetPermissions(
@@ skipping 211 matching lines @@
          ReadParam(m, iter, &p->active_permissions) &&
          ReadParam(m, iter, &p->withheld_permissions);
 }
 
 void ParamTraits<ExtensionMsg_Loaded_Params>::Log(const param_type& p,
                                                   std::string* l) {
   l->append(p.id);
 }
 
 }  // namespace IPC