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

webkit/glue/plugins/plugin_instance_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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
 // language support for exceptions is not present.  These macros interfere
 // with the use of |@try| and |@catch| in Objective-C files such as this one.
 // Undefine these macros here, after everything has been #included, since
 // there will be no C++ uses and only Objective-C uses from this point on.
 #undef try
 #undef catch
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
 @interface NSMenu (SnowLeopardMenuPopUpDeclaration)
 - (BOOL)popUpMenuPositioningItem:(NSMenuItem*)item
                       atLocation:(NSPoint)location
                           inView:(NSView*)view;
 @end
 #endif
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
 // Returns an autoreleased NSEvent constructed from the given np_event,
 // targeting the given window.
 NSEvent* NSEventForNPCocoaEvent(NPCocoaEvent* np_event, NSWindow* window) {
   bool mouse_down = 1;
   switch (np_event->type) {
     case NPCocoaEventMouseDown:
       mouse_down = 1;
       break;
@@ skipping 30 matching lines @@
                      windowNumber:[window windowNumber]
                           context:[NSGraphicsContext currentContext]
                       eventNumber:0
                        clickCount:click_count
                          pressure:1.0];
   return event;
 }
 
 }  // namespace
 
+namespace NPAPI {
+
 NPError PluginInstance::PopUpContextMenu(NPMenu* menu) {
   if (!currently_handled_event_)
     return NPERR_GENERIC_ERROR;
 
   CGRect main_display_bounds = CGDisplayBounds(CGMainDisplayID());
   NSPoint screen_point = NSMakePoint(
       plugin_origin_.x() + currently_handled_event_->data.mouse.pluginX,
       plugin_origin_.y() + currently_handled_event_->data.mouse.pluginY);
   // Plugin offsets are upper-left based, so flip vertically for Cocoa.
   screen_point.y = main_display_bounds.size.height - screen_point.y;
@@ skipping 32 matching lines @@
       [window release];
     }
     @catch (NSException* e) {
       NSLog(@"Caught exception while cleaning up in PopUpContextMenu: %@", e);
     }
   }
 
   return return_val;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI