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

webkit/glue/plugins/plugin_lib.h

Index: webkit/glue/plugins/plugin_lib.h
diff --git a/webkit/plugins/npapi/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h
similarity index 92%
rename from webkit/plugins/npapi/plugin_lib.h
rename to webkit/glue/plugins/plugin_lib.h
index 081e593a8a8502e47743c6046b748eed3d856980..ca46e4125a7661f0e4dfb632d7fff8c0239a6397 100644
--- a/webkit/plugins/npapi/plugin_lib.h
+++ b/webkit/glue/plugins/plugin_lib.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
+#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_LIB_H_
+#define WEBKIT_GLUE_PLUGINS_PLUGIN_LIB_H_
 
 #include <string>
 #include <vector>
@@ -12,14 +12,13 @@
 #include "base/native_library.h"
 #include "base/ref_counted.h"
 #include "build/build_config.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 class FilePath;
 struct WebPluginInfo;
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 class PluginInstance;
 
@@ -116,7 +115,6 @@ class PluginLib : public base::RefCounted<PluginLib> {
   DISALLOW_COPY_AND_ASSIGN(PluginLib);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
+#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_LIB_H_