Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/plugins/npapi/plugin_instance_mac.mm

Index: webkit/plugins/npapi/plugin_instance_mac.mm
===================================================================
--- webkit/plugins/npapi/plugin_instance_mac.mm	(revision 0)
+++ webkit/plugins/npapi/plugin_instance_mac.mm	(working copy)
@@ -2,12 +2,11 @@
 // 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 "webkit/glue/plugins/plugin_instance.h"
+#include "build/build_config.h"
+#include "webkit/plugins/npapi/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
@@ -26,6 +25,9 @@
 @end
 #endif
 
+namespace webkit {
+namespace npapi {
+
 namespace {
 
 // Returns an autoreleased NSEvent constructed from the given np_event,
@@ -76,8 +78,6 @@
 
 }  // namespace
 
-namespace NPAPI {
-
 NPError PluginInstance::PopUpContextMenu(NPMenu* menu) {
   if (!currently_handled_event_)
     return NPERR_GENERIC_ERROR;
@@ -130,4 +130,5 @@
   return return_val;
 }
 
-}  // namespace NPAPI
+}  // namespace npapi
+}  // namespace webkit