Remove plugin_list.h includes from chrome tests in preparation for moving webkit/plugins to content…

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
===================================================================
--- chrome/browser/extensions/extension_service_unittest.cc	(revision 212185)
+++ chrome/browser/extensions/extension_service_unittest.cc	(working copy)
@@ -110,7 +110,6 @@
 #include "webkit/browser/database/database_tracker.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/common/database/database_identifier.h"
-#include "webkit/plugins/npapi/mock_plugin_list.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/install_limiter.h"
@@ -4844,6 +4843,10 @@
 TEST(ExtensionServiceTestSimple, Enabledness) {
   // Make sure the PluginService singleton is destroyed at the end of the test.
   base::ShadowingAtExitManager at_exit_manager;
+#if defined(ENABLE_PLUGINS)
+  content::PluginService::GetInstance()->Init();
+  content::PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
+#endif
 
   ExtensionErrorReporter::Init(false);  // no noisy errors
   ExtensionsReadyRecorder recorder;
@@ -4861,11 +4864,6 @@
   base::FilePath install_dir = profile->GetPath()
       .AppendASCII(extensions::kInstallDirectoryName);
 
-#if defined(ENABLE_PLUGINS)
-  webkit::npapi::MockPluginList plugin_list;
-  PluginService::GetInstance()->SetPluginListForTesting(&plugin_list);
-#endif
-
   // By default, we are enabled.
   command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
   ExtensionService* service = static_cast<extensions::TestExtensionSystem*>(
@@ -4931,13 +4929,6 @@
   service = NULL;
   // Execute any pending deletion tasks.
   loop.RunUntilIdle();
-
-#if defined(ENABLE_PLUGINS)
-  // Ensure that even if the PluginService is re-used for a later test, it
-  // won't still hold a reference to the stack position of our MockPluginList.
-  // See crbug.com/159754.
-  PluginService::GetInstance()->SetPluginListForTesting(NULL);
-#endif
 }
 
 // Test loading extensions that require limited and unlimited storage quotas.