Refactor PluginService to take PluginList as a dependency.

content/browser/plugin_loader_posix.cc

Index: content/browser/plugin_loader_posix.cc
diff --git a/content/browser/plugin_loader_posix.cc b/content/browser/plugin_loader_posix.cc
index f077b87a2ab0f0f39515f4d4bf8fbff9bfd639ec..6d2be8553b3f2bed52eea8fb25b621631ed7298a 100644
--- a/content/browser/plugin_loader_posix.cc
+++ b/content/browser/plugin_loader_posix.cc
@@ -13,7 +13,6 @@
 #include "webkit/plugins/npapi/plugin_list.h"
 
 using content::BrowserThread;
-using webkit::npapi::PluginList;
 
 PluginLoaderPosix::PluginLoaderPosix()
     : next_load_index_(0) {
@@ -66,11 +65,12 @@ void PluginLoaderPosix::GetPluginsToLoad() {
   next_load_index_ = 0;
 
   canonical_list_.clear();
-  webkit::npapi::PluginList::Singleton()->GetPluginPathsToLoad(
+  PluginService::GetInstance()->plugin_list()->GetPluginPathsToLoad(
       &canonical_list_);
 
   internal_plugins_.clear();
-  PluginList::Singleton()->GetInternalPlugins(&internal_plugins_);
+  PluginService::GetInstance()->plugin_list()->GetInternalPlugins(
+      &internal_plugins_);
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&PluginLoaderPosix::LoadPluginsInternal,
@@ -149,7 +149,7 @@ bool PluginLoaderPosix::MaybeRunPendingCallbacks() {
   if (next_load_index_ < canonical_list_.size())
     return false;
 
-  PluginList::Singleton()->SetPlugins(loaded_plugins_);
+  PluginService::GetInstance()->plugin_list()->SetPlugins(loaded_plugins_);
   for (std::vector<PendingCallback>::iterator it = callbacks_.begin();
        it != callbacks_.end();
        ++it) {