Split PepperPluginRegistry into the pieces that are needed in each process. content/common only nee…

content/common/pepper_plugin_list.cc

Index: content/common/pepper_plugin_list.cc
===================================================================
--- content/common/pepper_plugin_list.cc	(revision 0)
+++ content/common/pepper_plugin_list.cc	(revision 0)
@@ -0,0 +1,112 @@
+// 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_list.h"
+
+#include "base/command_line.h"
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "content/public/common/content_client.h"
+#include "content/public/common/content_switches.h"
+#include "content/public/common/pepper_plugin_info.h"
+#include "ppapi/shared_impl/ppapi_permissions.h"
+
+namespace content {
+namespace {
+
+// Appends any plugins from the command line to the given vector.
+void ComputePluginsFromCommandLine(std::vector<PepperPluginInfo>* plugins) {
+  bool out_of_process = true;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiInProcess))
+    out_of_process = false;
+
+  const std::string value =
+      CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kRegisterPepperPlugins);
+  if (value.empty())
+    return;
+
+  // FORMAT:
+  // command-line = <plugin-entry> + *( LWS + "," + LWS + <plugin-entry> )
+  // plugin-entry =
+  //    <file-path> +
+  //    ["#" + <name> + ["#" + <description> + ["#" + <version>]]] +
+  //    *1( LWS + ";" + LWS + <mime-type> )
+  std::vector<std::string> modules;
+  base::SplitString(value, ',', &modules);
+  for (size_t i = 0; i < modules.size(); ++i) {
+    std::vector<std::string> parts;
+    base::SplitString(modules[i], ';', &parts);
+    if (parts.size() < 2) {
+      DLOG(ERROR) << "Required mime-type not found";
+      continue;
+    }
+
+    std::vector<std::string> name_parts;
+    base::SplitString(parts[0], '#', &name_parts);
+
+    PepperPluginInfo plugin;
+    plugin.is_out_of_process = out_of_process;
+#if defined(OS_WIN)
+    // This means we can't provide plugins from non-ASCII paths, but
+    // since this switch is only for development I don't think that's
+    // too awful.
+    plugin.path = base::FilePath(ASCIIToUTF16(name_parts[0]));
+#else
+    plugin.path = base::FilePath(name_parts[0]);
+#endif
+    if (name_parts.size() > 1)
+      plugin.name = name_parts[1];
+    if (name_parts.size() > 2)
+      plugin.description = name_parts[2];
+    if (name_parts.size() > 3)
+      plugin.version = name_parts[3];
+    for (size_t j = 1; j < parts.size(); ++j) {
+      WebPluginMimeType mime_type(parts[j],
+                                  std::string(),
+                                  plugin.description);
+      plugin.mime_types.push_back(mime_type);
+    }
+
+    // If the plugin name is empty, use the filename.
+    if (plugin.name.empty())
+      plugin.name = UTF16ToUTF8(plugin.path.BaseName().LossyDisplayName());
+
+    // Command-line plugins get full permissions.
+    plugin.permissions = ppapi::PERMISSION_ALL_BITS;
+
+    plugins->push_back(plugin);
+  }
+}
+
+}  // namespace
+
+bool MakePepperPluginInfo(const WebPluginInfo& webplugin_info,
+                          PepperPluginInfo* pepper_info) {
+  if (!webplugin_info.is_pepper_plugin())
+    return false;
+
+  pepper_info->is_out_of_process =
+      webplugin_info.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS ||
+      webplugin_info.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED;
+  pepper_info->is_sandboxed = webplugin_info.type !=
+      WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED;
+
+  pepper_info->path = base::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;
+}
+
+void ComputePepperPluginList(std::vector<PepperPluginInfo>* plugins) {
+  GetContentClient()->AddPepperPlugins(plugins);
+  ComputePluginsFromCommandLine(plugins);
+}
+
+}  // namespace content
Property changes on: content\common\pepper_plugin_list.cc
___________________________________________________________________
Added: svn:eol-style
   + LF