Move PluginPrefs to use PluginService instead of PluginList.

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 626 matching lines @@
 
 void PluginService::RemoveExtraPluginPath(const FilePath& path) {
   plugin_list()->RemoveExtraPluginPath(path);
 }
 
 void PluginService::UnregisterInternalPlugin(const FilePath& path) {
   plugin_list()->UnregisterInternalPlugin(path);
 }
 
 webkit::npapi::PluginList* PluginService::plugin_list() {
+  if (plugin_list_)
+    return 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);
 }