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

webkit/glue/plugins/plugin_instance_mac.mm

Index: webkit/glue/plugins/plugin_instance_mac.mm
diff --git a/webkit/plugins/npapi/plugin_instance_mac.mm b/webkit/glue/plugins/plugin_instance_mac.mm
similarity index 97%
rename from webkit/plugins/npapi/plugin_instance_mac.mm
rename to webkit/glue/plugins/plugin_instance_mac.mm
index bbcef8a7dec24208730847ba42899b5ee5c20aba..9800198120f30e1ae8cb78c2107baefc2f8a669a 100644
--- a/webkit/plugins/npapi/plugin_instance_mac.mm
+++ b/webkit/glue/plugins/plugin_instance_mac.mm
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
-#include "build/build_config.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_instance.h"
 
 // When C++ exceptions are disabled, the C++ library defines |try| and
 // |catch| so as to allow exception-expecting C++ code to build properly when
@@ -25,9 +26,6 @@
 @end
 #endif
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
 // Returns an autoreleased NSEvent constructed from the given np_event,
@@ -78,6 +76,8 @@ NSEvent* NSEventForNPCocoaEvent(NPCocoaEvent* np_event, NSWindow* window) {
 
 }  // namespace
 
+namespace NPAPI {
+
 NPError PluginInstance::PopUpContextMenu(NPMenu* menu) {
   if (!currently_handled_event_)
     return NPERR_GENERIC_ERROR;
@@ -130,5 +130,4 @@ NPError PluginInstance::PopUpContextMenu(NPMenu* menu) {
   return return_val;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI