Split ppapi::PluginList from PepperPluginRegistry so that DRT could load pepper plugins.

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
===================================================================
--- chrome/browser/extensions/extension_service.cc	(revision 101488)
+++ chrome/browser/extensions/extension_service.cc	(working copy)
@@ -83,12 +83,12 @@
 #include "content/common/content_notification_types.h"
 #include "content/common/json_value_serializer.h"
 #include "content/common/notification_service.h"
-#include "content/common/pepper_plugin_registry.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/registry_controlled_domain.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
 #include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_info.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -2838,13 +2838,14 @@
 }
 
 void ExtensionService::UpdatePluginListWithNaClModules() {
+  /*
   // An extension has been added which has a nacl_module component, which means
   // there is a MIME type that module wants to handle, so we need to add that
   // MIME type to plugins which handle NaCl modules in order to allow the
   // individual modules to handle these types.
-  const PepperPluginInfo* pepper_info = NULL;
-  std::vector<PepperPluginInfo> plugins;
-  PepperPluginRegistry::ComputeList(&plugins);
+  const webkit::ppapi::PluginInfo* pepper_info = NULL;
+  std::vector<webkit::ppapi::PluginInfo> plugins;
+  webkit::ppapi::PluginRegistry::ComputeList(&plugins);
 
   // Search the entire plugin list for plugins that handle the NaCl MIME type.
   // There can be multiple plugins like this, for instance the internal NaCl
@@ -2885,7 +2886,7 @@
         break;
       }
     }
-  }
+  }*/
 }
 
 ExtensionService::NaClModuleInfoList::iterator