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

webkit/glue/plugins/plugin_web_event_converter_mac.mm

Index: webkit/glue/plugins/plugin_web_event_converter_mac.mm
diff --git a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm b/webkit/glue/plugins/plugin_web_event_converter_mac.mm
similarity index 98%
rename from webkit/plugins/npapi/plugin_web_event_converter_mac.mm
rename to webkit/glue/plugins/plugin_web_event_converter_mac.mm
index ba45f2e21ed29f836bb8b4609627b6135b489667..12d5cc614c7f639ead7826de60c4b0522ae708dc 100644
--- a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm
+++ b/webkit/glue/plugins/plugin_web_event_converter_mac.mm
@@ -5,7 +5,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
-#include "webkit/plugins/npapi/plugin_web_event_converter_mac.h"
+#include "webkit/glue/plugins/plugin_web_event_converter_mac.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 
 using WebKit::WebInputEvent;
@@ -13,9 +13,6 @@ using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
 // Returns true if the caps lock flag should be set for the given event.
@@ -360,6 +357,3 @@ PluginWebEventConverter*
       return NULL;
   }
 }
-
-}  // namespace npapi
-}  // namespace webkit