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 95 matching lines @@
   }
 };
 #endif
 
 // static
 PluginService* PluginService::GetInstance() {
   return Singleton<PluginService>::get();
 }
 
 PluginService::PluginService()
-    : ui_locale_(
+    : did_init_(false),
+      plugin_list_(NULL),
+      ui_locale_(
           content::GetContentClient()->browser()->GetApplicationLocale()),
       filter_(NULL) {
+}
+
+PluginService::~PluginService() {
+#if defined(OS_WIN)
+  // Release the events since they're owned by RegKey, not WaitableEvent.
+  hkcu_watcher_.StopWatching();
+  hklm_watcher_.StopWatching();
+  if (hkcu_event_.get())
+    hkcu_event_->Release();
+  if (hklm_event_.get())
+    hklm_event_->Release();
+#endif
+  // Make sure no plugin channel requests have been leaked.
+  DCHECK(pending_plugin_clients_.empty());
+}
+
+void PluginService::Init() {
+  DCHECK(!did_init_);

[jam, 2011/11/10 21:53:54]

nit: is this member variable really needed now?

[Robert Sesek, 2011/11/10 22:04:32]

Doesn't have to be. Removed.

+
+  if (!plugin_list_)
+    plugin_list_ = webkit::npapi::PluginList::Singleton();
+
   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.
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   FilePath path = command_line->GetSwitchValuePath(switches::kLoadPlugin);
   if (!path.empty())
     AddExtraPluginPath(path);
   path = command_line->GetSwitchValuePath(switches::kExtraPluginDir);
   if (!path.empty())
     plugin_list()->AddExtraPluginDir(path);
 
 #if defined(OS_MACOSX)
   // We need to know when the browser comes forward so we can bring modal plugin
   // windows forward too.
   registrar_.Add(this, content::NOTIFICATION_APP_ACTIVATED,
                  content::NotificationService::AllSources());
 #endif
-}
 
-PluginService::~PluginService() {
-#if defined(OS_WIN)
-  // Release the events since they're owned by RegKey, not WaitableEvent.
-  hkcu_watcher_.StopWatching();
-  hklm_watcher_.StopWatching();
-  if (hkcu_event_.get())
-    hkcu_event_->Release();
-  if (hklm_event_.get())
-    hklm_event_->Release();
-#endif
-  // Make sure no plugin channel requests have been leaked.
-  DCHECK(pending_plugin_clients_.empty());
+  did_init_ = true;
 }
 
 void PluginService::StartWatchingPlugins() {
   // Start watching for changes in the plugin list. This means watching
   // for changes in the Windows registry keys and on both Windows and POSIX
   // watch for changes in the paths that are expected to contain plugins.
 #if defined(OS_WIN)
   if (hkcu_key_.Create(HKEY_CURRENT_USER,
                        webkit::npapi::kRegistryMozillaPlugins,
                        KEY_NOTIFY) == ERROR_SUCCESS) {
@@ skipping 468 matching lines @@
 }
 
 void PluginService::UnregisterInternalPlugin(const FilePath& path) {
   plugin_list()->UnregisterInternalPlugin(path);
 }
 
 webkit::npapi::PluginList* PluginService::plugin_list() {
   return webkit::npapi::PluginList::Singleton();
 }
 
+void PluginService::SetPluginListForTesting(
+    webkit::npapi::PluginList* plugin_list) {
+  plugin_list_ = plugin_list;
+}
+
 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);
 }