Add pepper permissions to WebPluginInfo

content/common/pepper_plugin_registry.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 "content/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/native_library.h"
 #include "base/string_split.h"
@@ skipping 78 matching lines @@
         webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS :
         webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED) :
       webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS;
 
   info.name = name.empty() ?
       path.BaseName().LossyDisplayName() : UTF8ToUTF16(name);
   info.path = path;
   info.version = ASCIIToUTF16(version);
   info.desc = ASCIIToUTF16(description);
   info.mime_types = mime_types;
+  info.pepper_permissions = permissions;
 
   return info;
 }
 
 bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info,
                           content::PepperPluginInfo* pepper_info) {
   if (!webkit::IsPepperPlugin(webplugin_info))
     return false;
 
   pepper_info->is_out_of_process = webkit::IsOutOfProcessPlugin(webplugin_info);
   pepper_info->is_sandboxed = webplugin_info.type !=
       webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED;
 
   pepper_info->path = FilePath(webplugin_info.path);
   pepper_info->name = UTF16ToASCII(webplugin_info.name);
   pepper_info->description = UTF16ToASCII(webplugin_info.desc);
   pepper_info->version = UTF16ToASCII(webplugin_info.version);
   pepper_info->mime_types = webplugin_info.mime_types;
+  pepper_info->permissions = webplugin_info.pepper_permissions;
+
   return true;
 }
 
 // static
 PepperPluginRegistry* PepperPluginRegistry::GetInstance() {
   static PepperPluginRegistry* registry = NULL;
   // This object leaks.  It is a temporary hack to work around a crash.
   // http://code.google.com/p/chromium/issues/detail?id=63234
   if (!registry)
     registry = new PepperPluginRegistry;
@@ skipping 108 matching lines @@
       // Preload all external plugins we're not running out of process.
       if (!module->InitAsLibrary(current.path)) {
         DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
         continue;
       }
     }
     preloaded_modules_[current.path] = module;
   }
 }