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

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 65 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/user_metrics.h"
 #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"
 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/extensions/extension_input_ime_api.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
@@ skipping 2729 matching lines @@
   nacl_module_list_.push_front(info);
 }
 
 void ExtensionService::UnregisterNaClModule(const GURL& url) {
   NaClModuleInfoList::iterator iter = FindNaClModule(url);
   DCHECK(iter != nacl_module_list_.end());
   nacl_module_list_.erase(iter);
 }
 
 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
   // plugin and a plugin registered by --register-pepper-plugins during tests.
   for (size_t i = 0; i < plugins.size(); ++i) {
     pepper_info = &plugins[i];
     CHECK(pepper_info);
     std::vector<webkit::WebPluginMimeType>::const_iterator mime_iter;
     // Check each MIME type the plugins handle for the NaCl MIME type.
     for (mime_iter = pepper_info->mime_types.begin();
@@ skipping 20 matching lines @@
           info.mime_types.push_back(mime_type_info);
         }
 
         webkit::npapi::PluginList::Singleton()->RefreshPlugins();
         webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
         // This plugin has been modified, no need to check the rest of its
         // types, but continue checking other plugins.
         break;
       }
     }
-  }
+  }*/
 }
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }