Refactor PluginService to take PluginList as a dependency.

content/browser/plugin_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 "content/browser/plugin_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 58 matching lines @@
 void WillLoadPluginsCallback() {
 #if defined(OS_WIN)
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 #else
   CHECK(false) << "Plugin loading should happen out-of-process.";
 #endif
 }
 
 }  // namespace
 
+// Custom Singleton traits to inject the PluginList.
+struct PluginServiceSingletonTraits :
+    public DefaultSingletonTraits<PluginService> {
+  static PluginService* New() {
+    return new PluginService(webkit::npapi::PluginList::Singleton());

[Bernhard Bauer, 2011/11/08 17:03:23]

If you set the WillLoadPluginsCallback here, you don't need to reset it when
creating a TestPluginService.

[Robert Sesek, 2011/11/08 17:21:00]

Good idea. Done.

+  }
+};
+
 #if defined(OS_MACOSX)
 static void NotifyPluginsOfActivation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (BrowserChildProcessHost::Iterator iter(ChildProcessInfo::PLUGIN_PROCESS);
        !iter.Done(); ++iter) {
     PluginProcessHost* plugin = static_cast<PluginProcessHost*>(*iter);
     plugin->OnAppActivation();
   }
 }
@@ skipping 13 matching lines @@
   virtual void OnFilePathError(const FilePath& path) OVERRIDE {
     // TODO(pastarmovj): Add some sensible error handling. Maybe silently
     // stopping the watcher would be enough. Or possibly restart it.
     NOTREACHED();
   }
 };
 #endif
 
 // static
 PluginService* PluginService::GetInstance() {
-  return Singleton<PluginService>::get();
+  return Singleton<PluginService, PluginServiceSingletonTraits>::get();
 }
 
-PluginService::PluginService()
-    : ui_locale_(
+PluginService::PluginService(webkit::npapi::PluginList* a_plugin_list)
+    : plugin_list_(a_plugin_list),
+      ui_locale_(
           content::GetContentClient()->browser()->GetApplicationLocale()),
       filter_(NULL) {
   plugin_list()->set_will_load_plugins_callback(
       base::Bind(&WillLoadPluginsCallback));
 
   RegisterPepperPlugins();
 
   content::GetContentClient()->AddNPAPIPlugins(plugin_list());
 
   // Load any specified on the command line as well.
@@ skipping 513 matching lines @@
   return webkit::npapi::PluginList::Singleton();
 }
 
 void PluginService::RegisterInternalPlugin(const webkit::WebPluginInfo& info) {
   plugin_list()->RegisterInternalPlugin(info);
 }
 
 string16 PluginService::GetPluginGroupName(const std::string& plugin_name) {
   return plugin_list()->GetPluginGroupName(plugin_name);
 }