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

webkit/glue/plugins/plugin_lib_mac.mm

Index: webkit/glue/plugins/plugin_lib_mac.mm
diff --git a/webkit/plugins/npapi/plugin_lib_mac.mm b/webkit/glue/plugins/plugin_lib_mac.mm
similarity index 97%
rename from webkit/plugins/npapi/plugin_lib_mac.mm
rename to webkit/glue/plugins/plugin_lib_mac.mm
index 6e3a22a441c5d8cfc14c911d6eec5c2821c57901..89444c821ae20f75a8116eaffb47c350b9855be1 100644
--- a/webkit/plugins/npapi/plugin_lib_mac.mm
+++ b/webkit/glue/plugins/plugin_lib_mac.mm
@@ -4,7 +4,7 @@
 
 #import <Carbon/Carbon.h>
 
-#include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/glue/plugins/plugin_lib.h"
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/native_library.h"
@@ -13,19 +13,18 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
+
+static const short kSTRTypeDefinitionResourceID = 128;
+static const short kSTRTypeDescriptionResourceID = 127;
+static const short kSTRPluginDescriptionResourceID = 126;
 
 using base::mac::ScopedCFTypeRef;
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 namespace {
 
-const short kSTRTypeDefinitionResourceID = 128;
-const short kSTRTypeDescriptionResourceID = 127;
-const short kSTRPluginDescriptionResourceID = 126;
-
 NSDictionary* GetMIMETypes(CFBundleRef bundle) {
   NSString* mime_filename =
       (NSString*)CFBundleGetValueForInfoDictionaryKey(bundle,
@@ -346,5 +345,4 @@ bool PluginLib::ReadWebPluginInfo(const FilePath &filename,
   return false;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI