Refactor PluginService to take PluginList as a dependency.

content/browser/plugin_loader_posix.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 "content/browser/plugin_loader_posix.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "content/common/utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
 using content::BrowserThread;
-using webkit::npapi::PluginList;
 
 PluginLoaderPosix::PluginLoaderPosix()
     : next_load_index_(0) {
 }
 
 void PluginLoaderPosix::LoadPlugins(
     scoped_refptr<base::MessageLoopProxy> target_loop,
     const PluginService::GetPluginsCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ skipping 32 matching lines @@
 
 void PluginLoaderPosix::GetPluginsToLoad() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::TimeTicks start_time(base::TimeTicks::Now());
 
   loaded_plugins_.clear();
   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,
                  make_scoped_refptr(this)));
 
   HISTOGRAM_TIMES("PluginLoaderPosix.GetPluginList",
                   (base::TimeTicks::Now() - start_time) *
                       base::Time::kMicrosecondsPerMillisecond);
 }
 
@@ skipping 58 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 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) {
     it->target_loop->PostTask(FROM_HERE,
         base::Bind(it->callback, loaded_plugins_));
   }
   callbacks_.clear();
 
   HISTOGRAM_TIMES("PluginLoaderPosix.LoadDone",
                   (base::TimeTicks::Now() - load_start_time_)
                       * base::Time::kMicrosecondsPerMillisecond);
   load_start_time_ = base::TimeTicks();
 
   return true;
 }
 
 PluginLoaderPosix::PendingCallback::PendingCallback(
     scoped_refptr<base::MessageLoopProxy> loop,
     const PluginService::GetPluginsCallback& cb)
     : target_loop(loop),
       callback(cb) {
 }
 
 PluginLoaderPosix::PendingCallback::~PendingCallback() {
 }