Extensions: send the whole manifest to the extensions process in

chrome/common/extensions/extension_messages.cc

Index: chrome/common/extensions/extension_messages.cc
diff --git a/chrome/common/extensions/extension_messages.cc b/chrome/common/extensions/extension_messages.cc
index 8324a6c0f32617a16d937b5ac01f86e719312522..4cdb44d54812e126ca5bc26355ec2fce7183ec01 100644
--- a/chrome/common/extensions/extension_messages.cc
+++ b/chrome/common/extensions/extension_messages.cc
@@ -15,49 +15,12 @@ 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),
-      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) {}
-
-ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
     const Extension* extension)
-    : manifest(new DictionaryValue()),
+    : manifest(extension->manifest()->value()->DeepCopy()),
       location(extension->location()),
       path(extension->path()),
-      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::kApp,
-    extension_manifest_keys::kContentScripts,
-    extension_manifest_keys::kIcons,
-    extension_manifest_keys::kManifestVersion,
-    extension_manifest_keys::kName,
-    extension_manifest_keys::kPageAction,
-    extension_manifest_keys::kPageActions,
-    extension_manifest_keys::kPermissions,
-    extension_manifest_keys::kPlatformApp,
-    extension_manifest_keys::kPublicKey,
-    extension_manifest_keys::kVersion,
-  };
-
-  // Copy only the data we need and bypass the manifest type checks.
-  DictionaryValue* source = extension->manifest()->value();
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRendererExtensionKeys); ++i) {
-    Value* temp = NULL;
-    if (source->Get(kRendererExtensionKeys[i], &temp))
-      manifest->Set(kRendererExtensionKeys[i], temp->DeepCopy());
-  }
 }
 
 scoped_refptr<Extension>
@@ -69,9 +32,6 @@ scoped_refptr<Extension>
                         &error));
   if (!extension.get())
     DLOG(ERROR) << "Error deserializing extension: " << error;
-  else
-    extension->SetActivePermissions(
-        new ExtensionPermissionSet(apis, explicit_hosts, scriptable_hosts));
 
   return extension;
 }
@@ -174,9 +134,6 @@ void ParamTraits<ExtensionMsg_Loaded_Params>::Write(Message* m,
   WriteParam(m, p.path);
   WriteParam(m, *(p.manifest));
   WriteParam(m, p.creation_flags);
-  WriteParam(m, p.apis);
-  WriteParam(m, p.explicit_hosts);
-  WriteParam(m, p.scriptable_hosts);
 }
 
 bool ParamTraits<ExtensionMsg_Loaded_Params>::Read(const Message* m,
@@ -186,10 +143,7 @@ bool ParamTraits<ExtensionMsg_Loaded_Params>::Read(const Message* m,
   return ReadParam(m, iter, &p->location) &&
          ReadParam(m, iter, &p->path) &&
          ReadParam(m, iter, p->manifest.get()) &&
-         ReadParam(m, iter, &p->creation_flags) &&
-         ReadParam(m, iter, &p->apis) &&
-         ReadParam(m, iter, &p->explicit_hosts) &&
-         ReadParam(m, iter, &p->scriptable_hosts);
+         ReadParam(m, iter, &p->creation_flags);
 }
 
 void ParamTraits<ExtensionMsg_Loaded_Params>::Log(const param_type& p,