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

webkit/glue/plugins/plugin_group_unittest.cc

Index: webkit/glue/plugins/plugin_group_unittest.cc
diff --git a/webkit/plugins/npapi/plugin_group_unittest.cc b/webkit/glue/plugins/plugin_group_unittest.cc
similarity index 95%
rename from webkit/plugins/npapi/plugin_group_unittest.cc
rename to webkit/glue/plugins/plugin_group_unittest.cc
index e82dc5a46f974132a77d559bb35bb7b47c4884e4..31dee1e0fa4a3288a2f18d7139e8790d513f4d7f 100644
--- a/webkit/plugins/npapi/plugin_group_unittest.cc
+++ b/webkit/glue/plugins/plugin_group_unittest.cc
@@ -2,7 +2,7 @@
 // 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>
@@ -13,11 +13,8 @@
 #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" }
@@ -162,8 +159,10 @@ TEST(PluginGroupTest, PluginGroupDescription) {
 
 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);
@@ -223,6 +222,3 @@ TEST(PluginGroupTest, DisabledByPolicy) {
   EXPECT_TRUE(PluginGroup::IsPluginNameDisabledByPolicy(
       ASCIIToUTF16("Google Earth")));
 }
-
-}  // namespace npapi
-}  // namespace webkit