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

webkit/glue/plugins/plugin_web_event_converter_mac.h

Index: webkit/glue/plugins/plugin_web_event_converter_mac.h
diff --git a/webkit/plugins/npapi/plugin_web_event_converter_mac.h b/webkit/glue/plugins/plugin_web_event_converter_mac.h
similarity index 87%
rename from webkit/plugins/npapi/plugin_web_event_converter_mac.h
rename to webkit/glue/plugins/plugin_web_event_converter_mac.h
index a525428e2b2c44f357058b8d0f90b48b2bbf4c4f..ec5b86febcef56742095d896219fae0cdb98b4fb 100644
--- a/webkit/plugins/npapi/plugin_web_event_converter_mac.h
+++ b/webkit/glue/plugins/plugin_web_event_converter_mac.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_WEB_EVENT_CONVERTER_MAC_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_WEB_EVENT_CONVERTER_MAC_H_
+#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_WEB_EVENT_CONVERTER_MAC_H_
+#define WEBKIT_GLUE_PLUGIN_PLUGIN_WEB_EVENT_CONVERTER_MAC_H_
 
 #include "third_party/npapi/bindings/npapi.h"
 
@@ -14,9 +14,6 @@ class WebMouseEvent;
 class WebMouseWheelEvent;
 }
 
-namespace webkit {
-namespace npapi {
-
 // Utility class to translating WebInputEvent structs to equivalent structures
 // suitable for sending to Mac plugins (via NPP_HandleEvent).
 class PluginWebEventConverter {
@@ -34,7 +31,7 @@ class PluginWebEventConverter {
   // Returns NULL iff InitWithEvent returned false.
   virtual void* plugin_event() = 0;
 
- protected:
+protected:
   // To be overridden by subclasses to store a converted plugin representation
   // of the given web event, suitable for returning from plugin_event.
   // Returns true if the event was successfully converted.
@@ -60,7 +57,4 @@ class PluginWebEventConverterFactory {
   DISALLOW_COPY_AND_ASSIGN(PluginWebEventConverterFactory);
 };
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_WEB_EVENT_CONVERTER_MAC_H_
+#endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_WEB_EVENT_CONVERTER_MAC_H_