Simplify ExtensionMsg_Loaded_Params message interface.

chrome/common/extensions/extension_messages.cc

 // Copyright (c) 2011 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/extension_messages.h"
 
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/common/common_param_traits.h"
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params()
-    : location(Extension::INVALID) {
-}
+    : location(Extension::INVALID) {}
 
-ExtensionMsg_Loaded_Params::~ExtensionMsg_Loaded_Params() {
-}
+ExtensionMsg_Loaded_Params::~ExtensionMsg_Loaded_Params() {}
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
     const ExtensionMsg_Loaded_Params& other)
     : manifest(other.manifest->DeepCopy()),
       location(other.location),
       path(other.path),
+      apis(other.apis),
+      explicit_hosts(other.explicit_hosts),
+      scriptable_hosts(other.scriptable_hosts),
       id(other.id),
-      creation_flags(other.creation_flags) {
-}
+      creation_flags(other.creation_flags) {}
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
-    const Extension* extension,
-    const ExtensionPermissionSet* active)
+    const Extension* extension)
     : manifest(new DictionaryValue()),
       location(extension->location()),
       path(extension->path()),
-      apis(active->apis()),
-      explicit_hosts(active->explicit_hosts()),
-      scriptable_hosts(active->scriptable_hosts()),
+      apis(extension->GetActivePermissions()->apis()),
+      explicit_hosts(extension->GetActivePermissions()->explicit_hosts()),
+      scriptable_hosts(extension->GetActivePermissions()->scriptable_hosts()),
       id(extension->id()),
       creation_flags(extension->creation_flags()) {
   // As we need more bits of extension data in the renderer, add more keys to
   // this list.
   const char* kRendererExtensionKeys[] = {
     extension_manifest_keys::kPublicKey,
     extension_manifest_keys::kName,
     extension_manifest_keys::kVersion,
     extension_manifest_keys::kIcons,
     extension_manifest_keys::kPageAction,
@@ skipping 13 matching lines @@
 
 scoped_refptr<Extension>
     ExtensionMsg_Loaded_Params::ConvertToExtension() const {
   std::string error;
 
   scoped_refptr<Extension> extension(
       Extension::Create(path, location, *manifest, creation_flags,
                         &error));
   if (!extension.get())
     LOG(ERROR) << "Error deserializing extension: " << error;
+  else
+    extension->SetActivePermissions(
+        new ExtensionPermissionSet(apis, explicit_hosts, scriptable_hosts));
 
   return extension;
 }
 
-const ExtensionPermissionSet*
-    ExtensionMsg_Loaded_Params::GetActivePermissions() const {
-  return new ExtensionPermissionSet(apis, explicit_hosts, scriptable_hosts);
-}
-
 namespace IPC {
 
 template <>
 struct ParamTraits<Extension::Location> {
   typedef Extension::Location param_type;
   static void Write(Message* m, const param_type& p) {
     int val = static_cast<int>(p);
     WriteParam(m, val);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
@@ skipping 101 matching lines @@
          ReadParam(m, iter, &p->explicit_hosts) &&
          ReadParam(m, iter, &p->scriptable_hosts);
 }
 
 void ParamTraits<ExtensionMsg_Loaded_Params>::Log(const param_type& p,
                                                   std::string* l) {
   l->append(p.id);
 }
 
 }  // namespace IPC