Migrate a bunch of LayoutTests from NPAPI to PPAPI

content/common/pepper_plugin_list.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_list.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
@@ skipping 36 matching lines @@
       base::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> )
+  //    *1( LWS + ";" + LWS + <mime-type-data> )
+  // mime-type-data = <mime-type> + *( LWS + "#" + LWS + <extension> )

[dcheng, 2016/03/22 18:03:05]

Nit: I think this should be *1, since there can only be one extension
associated?

[piman, 2016/03/23 05:30:24]

[] actually. *1 is 1 or more. I intended to support that (for .png), but turns
out I didn't need to.

   std::vector<std::string> modules = base::SplitString(
       value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   size_t plugins_to_register = modules.size();
   if (plugins_to_register > kMaxPluginsToRegisterFromCommandLine) {
     DVLOG(1) << plugins_to_register << " pepper plugins registered from"
              << " command line which exceeds the limit (maximum "
              << kMaxPluginsToRegisterFromCommandLine << " plugins allowed)";
     plugins_to_register = kMaxPluginsToRegisterFromCommandLine;
   }
@@ skipping 30 matching lines @@
       }
     }
 
     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(),
+      std::vector<std::string> mime_parts = base::SplitString(
+          parts[j], "#", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+      DCHECK_GT(mime_parts.size(), 1u);
+      std::string mime_extension;
+      if (mime_parts.size() > 1)
+        mime_extension = mime_parts[1];
+      WebPluginMimeType mime_type(mime_parts[0],
+                                  mime_extension,
                                   plugin.description);
       plugin.mime_types.push_back(mime_type);
     }
 
     // If the plugin name is empty, use the filename.
     if (plugin.name.empty()) {
       plugin.name =
           base::UTF16ToUTF8(plugin.path.BaseName().LossyDisplayName());
     }
 
@@ skipping 23 matching lines @@
 
   return true;
 }
 
 void ComputePepperPluginList(std::vector<PepperPluginInfo>* plugins) {
   GetContentClient()->AddPepperPlugins(plugins);
   ComputePluginsFromCommandLine(plugins);
 }
 
 }  // namespace content