Move PluginPrefs to use PluginService instead of PluginList.

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 171 matching lines @@
   // 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();
+  webkit::npapi::PluginList* plugin_list() { return 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();
@@ skipping 79 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_