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

chrome/browser/extensions/api/content_settings/content_settings_api.cc

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc
===================================================================
--- chrome/browser/extensions/api/content_settings/content_settings_api.cc	(revision 212185)
+++ chrome/browser/extensions/api/content_settings/content_settings_api.cc	(working copy)
@@ -40,8 +40,6 @@
 
 namespace {
 
-const std::vector<webkit::WebPluginInfo>* g_testing_plugins_;
-
 bool RemoveContentType(base::ListValue* args,
                        ContentSettingsType* content_type) {
   std::string content_type_str;
@@ -260,14 +258,10 @@
     return true;
   }
 
-  if (!g_testing_plugins_) {
-    PluginService::GetInstance()->GetPlugins(
-        base::Bind(&ContentSettingsContentSettingGetResourceIdentifiersFunction::
-                   OnGotPlugins,
-                   this));
-  } else {
-    OnGotPlugins(*g_testing_plugins_);
-  }
+  PluginService::GetInstance()->GetPlugins(
+      base::Bind(&ContentSettingsContentSettingGetResourceIdentifiersFunction::
+                 OnGotPlugins,
+                 this));
   return true;
 }
 
@@ -298,10 +292,4 @@
           true));
 }
 
-// static
-void ContentSettingsContentSettingGetResourceIdentifiersFunction::
-    SetPluginsForTesting(const std::vector<webkit::WebPluginInfo>* plugins) {
-  g_testing_plugins_ = plugins;
-}
-
 }  // namespace extensions