Remove webkit/plugins/npapi.

content/common/plugin_list_unittest.cc

Index: content/common/plugin_list_unittest.cc
===================================================================
--- content/common/plugin_list_unittest.cc	(revision 212595)
+++ content/common/plugin_list_unittest.cc	(working copy)
@@ -15,6 +15,10 @@
 
 namespace {
 
+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";
+
 bool Equals(const WebPluginInfo& a, const WebPluginInfo& b) {
   return (a.name == b.name &&
           a.path == b.path &&
@@ -34,13 +38,6 @@
 
 }  // namespace
 
-// Linux Aura and Android don't support NPAPI.
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(USE_AURA))
-
-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";
-
 class PluginListTest : public testing::Test {
  public:
   PluginListTest()
@@ -68,7 +65,7 @@
 
 TEST_F(PluginListTest, GetPlugins) {
   std::vector<WebPluginInfo> plugins;
-  plugin_list_.GetPlugins(&plugins);
+  plugin_list_.GetPlugins(&plugins, true);
   EXPECT_EQ(2u, plugins.size());
   EXPECT_TRUE(Contains(plugins, foo_plugin_));
   EXPECT_TRUE(Contains(plugins, bar_plugin_));
@@ -83,12 +80,10 @@
   // Now we should have them in the state we specified above.
   plugin_list_.RefreshPlugins();
   std::vector<WebPluginInfo> plugins;
-  plugin_list_.GetPlugins(&plugins);
+  plugin_list_.GetPlugins(&plugins, true);
   ASSERT_TRUE(Contains(plugins, plugin_3043));
 }
 
-#endif
-
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 
 // Test parsing a simple description: Real Audio.