Enable permission warnings from ManifestHandlers.

chrome/common/extensions/extension_messages.cc

 // Copyright (c) 2012 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.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/permissions/permissions_data.h"
 #include "content/public/common/common_param_traits.h"
 #include "extensions/common/manifest.h"
+#include "extensions/common/manifest_handler.h"
 #include "extensions/common/permissions/permissions_info.h"
 
 using extensions::APIPermission;
 using extensions::APIPermissionInfo;
-using extensions::APIPermissionMap;
 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_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()),
       apis(extension->GetActivePermissions()->apis()),
+      manifest_permissions(
+          extension->GetActivePermissions()->manifest_permissions()),
       explicit_hosts(extension->GetActivePermissions()->explicit_hosts()),
       scriptable_hosts(extension->GetActivePermissions()->scriptable_hosts()),
       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()) {
     extensions::PermissionsData::SetActivePermissions(
         extension.get(),
-        new PermissionSet(apis, explicit_hosts, scriptable_hosts));
+        new PermissionSet(apis, manifest_permissions,
+                          explicit_hosts, scriptable_hosts));
   }
   return extension;
 }
 
 namespace IPC {
 
 template <>
 struct ParamTraits<Manifest::Location> {
   typedef Manifest::Location param_type;
   static void Write(Message* m, const param_type& p) {
@@ skipping 117 matching lines @@
     r->insert(p.release());
   }
   return true;
 }
 
 void ParamTraits<APIPermissionSet>::Log(
     const param_type& p, std::string* l) {
   LogParam(p.map(), l);
 }
 
+void ParamTraits<ManifestPermissionSet>::Write(
+    Message* m, const param_type& p) {
+  ManifestPermissionSet::const_iterator it = p.begin();
+  const ManifestPermissionSet::const_iterator end = p.end();
+  WriteParam(m, p.size());
+  for (; it != end; ++it) {
+    WriteParam(m, it->name());
+    it->Write(m);
+  }
+}
+
+bool ParamTraits<ManifestPermissionSet>::Read(
+    const Message* m, PickleIterator* iter, param_type* r) {
+  size_t size;
+  if (!ReadParam(m, iter, &size))
+    return false;
+  for (size_t i = 0; i < size; ++i) {
+    std::string name;
+    if (!ReadParam(m, iter, &name))
+      return false;
+    scoped_ptr<ManifestPermission> p(ManifestHandler::CreatePermission(name));
+    if (!p)
+      return false;
+    if (!p->Read(m, iter))
+      return false;
+    r->insert(p.release());
+  }
+  return true;
+}
+
+void ParamTraits<ManifestPermissionSet>::Log(
+    const param_type& p, std::string* l) {
+  LogParam(p.map(), l);
+}
+
 void ParamTraits<ExtensionMsg_Loaded_Params>::Write(Message* m,
                                                     const param_type& p) {
   WriteParam(m, p.location);
   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);
 }
@@ skipping 10 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