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

webkit/glue/plugins/plugin_group.cc

Index: webkit/glue/plugins/plugin_group.cc
diff --git a/webkit/plugins/npapi/plugin_group.cc b/webkit/glue/plugins/plugin_group.cc
similarity index 96%
rename from webkit/plugins/npapi/plugin_group.cc
rename to webkit/glue/plugins/plugin_group.cc
index ec1b537b2975ea02ee87747be671d29eb0a26347..548e624a81fd239a9406a24dd134e5cf0503f374 100644
--- a/webkit/plugins/npapi/plugin_group.cc
+++ b/webkit/glue/plugins/plugin_group.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 "base/linked_ptr.h"
 #include "base/string_util.h"
@@ -10,11 +10,8 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
-
-namespace webkit {
-namespace npapi {
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 
 const char* PluginGroup::kAdobeReaderGroupName = "Adobe Reader";
 
@@ -49,7 +46,7 @@ bool PluginGroup::IsPluginNameDisabledByPolicy(const string16& plugin_name) {
 /*static*/
 bool PluginGroup::IsPluginPathDisabledByPolicy(const FilePath& plugin_path) {
   std::vector<WebPluginInfo> plugins;
-  PluginList::Singleton()->GetPlugins(false, &plugins);
+  NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
   for (std::vector<WebPluginInfo>::const_iterator it = plugins.begin();
        it != plugins.end();
        ++it) {
@@ -384,7 +381,7 @@ void PluginGroup::DisableOutdatedPlugins() {
       for (size_t i = 0; i < version_ranges_.size(); ++i) {
         if (IsPluginOutdated(*version, version_ranges_[i])) {
           it->enabled = false;
-          PluginList::Singleton()->DisablePlugin(it->path);
+          NPAPI::PluginList::Singleton()->DisablePlugin(it->path);
         }
       }
     }
@@ -398,16 +395,13 @@ void PluginGroup::Enable(bool enable) {
        web_plugin_infos_.begin();
        it != web_plugin_infos_.end(); ++it) {
     if (enable && !IsPluginNameDisabledByPolicy(it->name)) {
-      PluginList::Singleton()->EnablePlugin(it->path);
+      NPAPI::PluginList::Singleton()->EnablePlugin(it->path);
       it->enabled = true;
       enabled_plugin_exists = true;
     } else {
       it->enabled = false;
-      PluginList::Singleton()->DisablePlugin(it->path);
+      NPAPI::PluginList::Singleton()->DisablePlugin(it->path);
     }
   }
   enabled_ = enabled_plugin_exists;
 }
-
-}  // namespace npapi
-}  // namespace webkit