[Extensions] Un-refcount PermissionSet

extensions/common/extension_messages.cc

Index: extensions/common/extension_messages.cc
diff --git a/extensions/common/extension_messages.cc b/extensions/common/extension_messages.cc
index 42e25f4351d57e90fc187b20f20e68834203b0f2..76c36dce99caa1e9aa9388d2d8e9b7c744ba3373 100644
--- a/extensions/common/extension_messages.cc
+++ b/extensions/common/extension_messages.cc
@@ -36,10 +36,10 @@ ExtensionMsg_PermissionSetStruct::ExtensionMsg_PermissionSetStruct(
 ExtensionMsg_PermissionSetStruct::~ExtensionMsg_PermissionSetStruct() {
 }
 
-scoped_refptr<const PermissionSet>
+scoped_ptr<const PermissionSet>
 ExtensionMsg_PermissionSetStruct::ToPermissionSet() const {
-  return new PermissionSet(
-      apis, manifest_permissions, explicit_hosts, scriptable_hosts);
+  return make_scoped_ptr(new PermissionSet(apis, manifest_permissions,
+                                           explicit_hosts, scriptable_hosts));
 }
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params()
@@ -60,9 +60,8 @@ ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
       id(extension->id()),
       creation_flags(extension->creation_flags()) {
   if (include_tab_permissions) {
-    extensions::PermissionsData::TabPermissionsMap tab_permissions =
-        extension->permissions_data()->CopyTabSpecificPermissionsMap();
-    for (const auto& pair : tab_permissions) {
+    for (const auto& pair :
+         extension->permissions_data()->tab_specific_permissions()) {
       tab_specific_permissions[pair.first] =
           ExtensionMsg_PermissionSetStruct(*pair.second);
     }
@@ -80,7 +79,7 @@ scoped_refptr<Extension> ExtensionMsg_Loaded_Params::ConvertToExtension(
                                      withheld_permissions.ToPermissionSet());
     for (const auto& pair : tab_specific_permissions) {
       permissions_data->UpdateTabSpecificPermissions(
-          pair.first, pair.second.ToPermissionSet());
+          pair.first, *pair.second.ToPermissionSet());
     }
   }
   return extension;