Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

webkit/glue/plugins/plugin_group_unittest.cc

 // Copyright (c) 2010 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 "webkit/plugins/npapi/plugin_group.h"
+#include "webkit/glue/plugins/plugin_group.h"
 
 #include <string>
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-
-namespace webkit {
-namespace npapi {
+#include "webkit/glue/plugins/webplugininfo.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 static const VersionRangeDefinition kPluginVersionRange[] = {
     { "", "", "3.0.44" }
 };
 static const VersionRangeDefinition kPlugin3VersionRange[] = {
     { "0", "4", "3.0.44" }
 };
 static const VersionRangeDefinition kPlugin4VersionRange[] = {
     { "4", "5", "4.0.44" }
 };
@@ skipping 124 matching lines @@
       EXPECT_TRUE(group->Match(plugin3045));
       group->AddPlugin(plugin3045, 0);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
     }
   }
 }
 
 TEST(PluginGroupTest, PluginGroupDefinition) {
   const PluginGroupDefinition* definitions =
-      PluginList::GetPluginGroupDefinitions();
-  for (size_t i = 0; i < PluginList::GetPluginGroupDefinitionsSize(); ++i) {
+      NPAPI::PluginList::GetPluginGroupDefinitions();
+  for (size_t i = 0;
+       i < NPAPI::PluginList::GetPluginGroupDefinitionsSize();
+       ++i) {
     scoped_ptr<PluginGroup> def_group(
         PluginGroupTest::CreatePluginGroup(definitions[i]));
     ASSERT_TRUE(def_group.get() != NULL);
     EXPECT_FALSE(def_group->Match(kPlugin2043));
   }
 }
 
 TEST(PluginGroupTest, DisableOutdated) {
   PluginGroupDefinition plugindefs[] = { kPluginDef3, kPluginDef34 };
   for (size_t i = 0; i < 2; ++i) {
@@ skipping 39 matching lines @@
   disabled_plugins.insert(ASCIIToUTF16("Disable this!"));
   disabled_plugins.insert(ASCIIToUTF16("*Google*"));
   PluginGroup::SetPolicyDisabledPluginPatterns(disabled_plugins);
 
   EXPECT_FALSE(PluginGroup::IsPluginNameDisabledByPolicy(ASCIIToUTF16("42")));
   EXPECT_TRUE(PluginGroup::IsPluginNameDisabledByPolicy(
       ASCIIToUTF16("Disable this!")));
   EXPECT_TRUE(PluginGroup::IsPluginNameDisabledByPolicy(
       ASCIIToUTF16("Google Earth")));
 }
-
-}  // namespace npapi
-}  // namespace webkit