Refactor PluginService to take PluginList as a dependency.

content/browser/plugin_service.h

 // 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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_
 #pragma once
@@ skipping 139 matching lines @@
   // will use cached data in the plugin list.
   bool GetPluginInfoByPath(const FilePath& plugin_path,
                            webkit::WebPluginInfo* info);
 
   // Marks the plugin list as dirty and will cause the plugins to be reloaded
   // on the next access through GetPlugins() or GetPluginGroups().
   void RefreshPluginList();
 
   // Asynchronously loads plugins if necessary and then calls back to the
   // provided function on the calling MessageLoop on completion.
-  void GetPlugins(const GetPluginsCallback& callback);
+  virtual void GetPlugins(const GetPluginsCallback& callback);
 
   // Asynchronously loads the list of plugin groups if necessary and then calls
   // back to the provided function on the calling MessageLoop on completion.
-  void GetPluginGroups(const GetPluginGroupsCallback& callback);
+  virtual void GetPluginGroups(const GetPluginGroupsCallback& callback);
 
   // Tells all the renderer processes associated with the given browser context
   // to throw away their cache of the plugin list, and optionally also reload
   // all the pages with plugins. If |browser_context| is NULL, purges the cache
   // in all renderers.
   // NOTE: can only be called on the UI thread.
   static void PurgePluginListCache(content::BrowserContext* browser_context,
                                    bool reload_pages);
 
   void set_filter(content::PluginServiceFilter* filter) {
     filter_ = filter;
   }
   content::PluginServiceFilter* filter() { return filter_; }
 
+  webkit::npapi::PluginList* plugin_list() const { return plugin_list_; }
+
+ protected:
+  // Creates the PluginService object, but the actual plugin list is generated
+  // lazily. If |plugin_list| is NULL, the singleton will be used. In tests,
+  // use MockPluginList for dependency injection.
+  PluginService(webkit::npapi::PluginList* plugin_list = NULL);

[Bernhard Bauer, 2011/11/07 22:37:50]

Could you have a protected mutator to set the plugin list to get around the
default parameter here? We could probably move some of the initialization code
in the constructor that uses |plugin_list| to the client.

[Robert Sesek, 2011/11/07 23:05:49]

No, but I can create a custom singleton traits.

+  virtual ~PluginService();
+
  private:
   friend struct DefaultSingletonTraits<PluginService>;
 
-  // Creates the PluginService object, but doesn't actually build the plugin
-  // list yet.  It's generated lazily.
-  PluginService();
-  virtual ~PluginService();
-
   // base::WaitableEventWatcher::Delegate implementation.
   virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
 
   // content::NotificationObserver implementation
   virtual void Observe(int type, const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
   void RegisterPepperPlugins();
 
   content::PepperPluginInfo* GetRegisteredPpapiPluginInfo(
@@ skipping 28 matching lines @@
       PluginProcessHost::Client* client);
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Registers a new FilePathWatcher for a given path.
   static void RegisterFilePathWatcher(
       base::files::FilePathWatcher* watcher,
       const FilePath& path,
       base::files::FilePathWatcher::Delegate* delegate);
 #endif
 
+  // The plugin list instance.
+  webkit::npapi::PluginList* plugin_list_;
+
   // The browser's UI locale.
   const std::string ui_locale_;
 
   content::NotificationRegistrar registrar_;
 
 #if defined(OS_WIN)
   // Registry keys for getting notifications when new plugins are installed.
   base::win::RegKey hkcu_key_;
   base::win::RegKey hklm_key_;
   scoped_ptr<base::WaitableEvent> hkcu_event_;
@@ skipping 17 matching lines @@
 #if defined(OS_POSIX)
   scoped_refptr<PluginLoaderPosix> plugin_loader_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PluginService);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_H_