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

webkit/glue/plugins/plugin_web_event_converter_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.
 
 #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;
 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.
 bool CapsLockIsActive(const WebInputEvent& event) {
   // Only key events have accurate information for the caps lock flag; see
   // <https://bugs.webkit.org/show_bug.cgi?id=46518>.
   // For other types, use the live state.
   if (WebInputEvent::isKeyboardEventType(event.type))
     return (event.modifiers & WebInputEvent::CapsLockOn) != 0;
   else
@@ skipping 324 matching lines @@
       return new CocoaPluginWebEventConverter();
 #ifndef NP_NO_CARBON
     case NPEventModelCarbon:
       return new CarbonPluginWebEventConverter();
 #endif
     default:
       NOTIMPLEMENTED();
       return NULL;
   }
 }
-
-}  // namespace npapi
-}  // namespace webkit