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

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

 // Copyright (c) 2012 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 "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "webkit/plugins/npapi/mock_plugin_list.h"
+#include "content/public/browser/plugin_service.h"
+#include "webkit/plugins/webplugininfo.h"
 
 namespace extensions {
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_;
 
   HostContentSettingsMap* map =
@@ skipping 61 matching lines @@
 #if 0
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map->GetContentSetting(
                 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, ""));
 #endif
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map->GetContentSetting(
                 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
 }
 
+class ContentSettingsGetResourceIdentifiersTest : public ExtensionApiTest {
+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kDisablePluginsDiscovery);
+    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
+  }
+};
+
 // Flaky on the trybots. See http://crbug.com/96725.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
-                       DISABLED_ContentSettingsGetResourceIdentifiers) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);

[scottmg, 2013/07/18 00:33:09]

?

[jam, 2013/07/18 00:36:34]

i'm not sure what you mean? that line moved up to line 103. i could have made it
stay here, but since i needed to change the command line early for
kDisablePluginsDiscovery, i made both command line changes in the same method

[scottmg, 2013/07/18 00:38:30]

sorry, missed that.

-
+IN_PROC_BROWSER_TEST_F(ContentSettingsGetResourceIdentifiersTest,
+                       DISABLED_Test) {
   base::FilePath::CharType kFooPath[] =
       FILE_PATH_LITERAL("/plugins/foo.plugin");
   base::FilePath::CharType kBarPath[] =
       FILE_PATH_LITERAL("/plugins/bar.plugin");
   const char* kFooName = "Foo Plugin";
   const char* kBarName = "Bar Plugin";
 
-  webkit::npapi::MockPluginList plugin_list;
-  plugin_list.AddPluginToLoad(
+  content::PluginService::GetInstance()->RegisterInternalPlugin(
       webkit::WebPluginInfo(ASCIIToUTF16(kFooName),
                             base::FilePath(kFooPath),
                             ASCIIToUTF16("1.2.3"),
-                            ASCIIToUTF16("foo")));
-  plugin_list.AddPluginToLoad(
-      webkit::WebPluginInfo(ASCIIToUTF16(kBarName),
+                            ASCIIToUTF16("foo")),
+      false);
+  content::PluginService::GetInstance()->RegisterInternalPlugin(
+    webkit::WebPluginInfo(ASCIIToUTF16(kBarName),
                             base::FilePath(kBarPath),
                             ASCIIToUTF16("2.3.4"),
-                            ASCIIToUTF16("bar")));
-
-  std::vector<webkit::WebPluginInfo> plugins;
-  plugin_list.GetPlugins(&plugins);
-
-  ContentSettingsContentSettingGetResourceIdentifiersFunction::
-      SetPluginsForTesting(&plugins);
+                            ASCIIToUTF16("bar")),
+      false);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
       << message_;
-
-  ContentSettingsContentSettingGetResourceIdentifiersFunction::
-      SetPluginsForTesting(NULL);
 }
 
 }  // namespace extensions