Refactor PluginService to take PluginList as a dependency.

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 36ab753b74bca1e693126b91e6f2b0e80f6ede5a..665d798a1f8d0bdf0b8ffc972669cd0eb6e397f1 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -89,6 +89,7 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(OS_WIN)
 #include "views/focus/view_storage.h"
@@ -787,6 +788,7 @@ void BrowserProcessImpl::CreateIOThread() {
   // on the main thread. The service ctor is inexpensive and does not
   // invoke the io_thread() accessor.
   PluginService* plugin_service = PluginService::GetInstance();
+  plugin_service->Init(webkit::npapi::PluginList::Singleton());

[jam, 2011/11/09 17:37:23]

this won't work in the component build (since the singleton will be different in
chrome vs content). so just make Init take 0 parameters, and in that function
grab webkit::npapi::PluginList::Singleton() if it hasn't been already set.

you'll want to have a method on PS as before to set the plugin list for testing,
i.e. SetPluginListForTesting(PluginList*

   plugin_service->set_filter(ChromePluginServiceFilter::GetInstance());
   plugin_service->StartWatchingPlugins();