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 63 matching lines @@
   };
 
   typedef base::Callback<void(const std::vector<webkit::WebPluginInfo>&)>
       GetPluginsCallback;
   typedef base::Callback<void(const std::vector<webkit::npapi::PluginGroup>&)>
       GetPluginGroupsCallback;
 
   // Returns the PluginService singleton.
   static PluginService* GetInstance();
 
+  // Must be called on the instance to finish initialization.
+  void Init();
+
   // Starts watching for changes in the list of installed plug-ins.
   void StartWatchingPlugins();
 
   // Gets the browser's UI locale.
   const std::string& GetUILocale();
 
   // Returns the plugin process host corresponding to the plugin process that
   // has been started by this service. Returns NULL if no process has been
   // started.
   PluginProcessHost* FindNpapiPluginProcess(const FilePath& plugin_path);
@@ skipping 72 matching lines @@
   // 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_; }
 
-
   // The following functions are wrappers around webkit::npapi::PluginList.
   // These must be used instead of those in order to ensure that we have a
   // single global list in the component build and so that we don't
   // accidentally load plugins in the wrong process or thread. Refer to
   // PluginList for further documentation of these functions.
   void RefreshPlugins();
   void AddExtraPluginPath(const FilePath& path);
   void RemoveExtraPluginPath(const FilePath& path);
   void UnregisterInternalPlugin(const FilePath& path);
   void RegisterInternalPlugin(const webkit::WebPluginInfo& info);
   string16 GetPluginGroupName(const std::string& plugin_name);
 
   // TODO(dpranke): This should be private.
   webkit::npapi::PluginList* plugin_list();
 
+  void SetPluginListForTesting(webkit::npapi::PluginList* plugin_list);
+
  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);
@@ skipping 36 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
 
+  // Whether or not the Init() method was called.
+  bool did_init_;
+
+  // 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_