Revert 50667 - Add in support for internal pepper plugins into the PepperPlug...

chrome/common/pepper_plugin_registry.cc

 // Copyright (c) 2010 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/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_switches.h"
-#include "remoting/client/plugin/pepper_entrypoints.h"
 
 // static
 PepperPluginRegistry* PepperPluginRegistry::GetInstance() {
   static PepperPluginRegistry registry;
   return &registry;
 }
 
 // static
 void PepperPluginRegistry::GetList(std::vector<PepperPluginInfo>* plugins) {
-  InternalPluginInfoList internal_plugin_info;
-  GetInternalPluginInfo(&internal_plugin_info);
-  for (InternalPluginInfoList::const_iterator it =
-         internal_plugin_info.begin();
-       it != internal_plugin_info.end();
-       ++it) {
-    plugins->push_back(*it);
-  }
-
-  GetPluginInfoFromSwitch(plugins);
-}
-
-// static
-void PepperPluginRegistry::GetPluginInfoFromSwitch(
-    std::vector<PepperPluginInfo>* plugins) {
   const std::wstring& value = CommandLine::ForCurrentProcess()->GetSwitchValue(
       switches::kRegisterPepperPlugins);
   if (value.empty())
     return;
 
   // FORMAT:
   // command-line = <plugin-entry> + *( LWS + "," + LWS + <plugin-entry> )
   // plugin-entry = <file-path> + *1( LWS + ";" + LWS + <mime-type> )
 
   std::vector<std::wstring> modules;
   SplitString(value, ',', &modules);
   for (size_t i = 0; i < modules.size(); ++i) {
     std::vector<std::wstring> parts;
     SplitString(modules[i], ';', &parts);
     if (parts.size() < 2) {
       DLOG(ERROR) << "Required mime-type not found";
       continue;
     }
 
     PepperPluginInfo plugin;
     plugin.path = FilePath::FromWStringHack(parts[0]);
     for (size_t j = 1; j < parts.size(); ++j)
       plugin.mime_types.push_back(WideToASCII(parts[j]));
 
     plugins->push_back(plugin);
   }
 }
 
-// static
-void PepperPluginRegistry::GetInternalPluginInfo(
-    InternalPluginInfoList* plugin_info) {
-  // Currently, to centralize the internal plugin registration logic, we
-  // hardcode the list of plugins, mimetypes, and registration information
-  // in this function.  This is gross, but because the GetList() function is
-  // called from both the renderer and browser the other option is to force a
-  // special register function for each plugin to be called by both
-  // RendererMain() and BrowserMain().  This seemed like the better tradeoff.
-  //
-  // TODO(ajwong): Think up a better way to maintain the plugin registration
-  // information. Pehraps by construction of a singly linked list of
-  // plugin initializers that is built with static initializers?
-
-#if defined(ENABLE_REMOTING)
-  InternalPluginInfo info;
-  // Add the chromoting plugin.
-  info.path =
-      FilePath(FILE_PATH_LITERAL("internal-chromoting"));
-  info.mime_types.push_back("pepper-application/x-chromoting");
-  info.entry_points.get_interface = remoting::PPP_GetInterface;
-  info.entry_points.initialize_module = remoting::PPP_InitializeModule;
-  info.entry_points.shutdown_module = remoting::PPP_ShutdownModule;
-
-  plugin_info->push_back(info);
-#endif
-
-}
-
 pepper::PluginModule* PepperPluginRegistry::GetModule(
     const FilePath& path) const {
   ModuleMap::const_iterator it = modules_.find(path);
   if (it == modules_.end())
     return NULL;
   return it->second;
 }
 
 PepperPluginRegistry::PepperPluginRegistry() {
-  InternalPluginInfoList internal_plugin_info;
-  GetInternalPluginInfo(&internal_plugin_info);
-  // Register modules for these suckers.
-  for (InternalPluginInfoList::const_iterator it =
-         internal_plugin_info.begin();
-       it != internal_plugin_info.end();
-       ++it) {
-    const FilePath& path = it->path;
-    ModuleHandle module =
-        pepper::PluginModule::CreateInternalModule(it->entry_points);
-    if (!module) {
-      DLOG(ERROR) << "Failed to load pepper module: " << path.value();
-      continue;
-    }
-    modules_[path] = module;
-  }
-
-  // Add the modules specified on the command line last so that they can
-  // override the internal plugins.
   std::vector<PepperPluginInfo> plugins;
-  GetPluginInfoFromSwitch(&plugins);
+  GetList(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     const FilePath& path = plugins[i].path;
     ModuleHandle module = pepper::PluginModule::CreateModule(path);
     if (!module) {
       DLOG(ERROR) << "Failed to load pepper module: " << path.value();
       continue;
     }
     modules_[path] = module;
   }
 }