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

webkit/glue/plugins/npapi_extension_thunk.h

Index: webkit/glue/plugins/npapi_extension_thunk.h
diff --git a/webkit/plugins/npapi/npapi_extension_thunk.h b/webkit/glue/plugins/npapi_extension_thunk.h
similarity index 69%
rename from webkit/plugins/npapi/npapi_extension_thunk.h
rename to webkit/glue/plugins/npapi_extension_thunk.h
index 683e07eaded061dbc39b4d9541bc631bc6797b50..fada6bc2036d9ac633d76bb84d5883bfef13f589 100644
--- a/webkit/plugins/npapi/npapi_extension_thunk.h
+++ b/webkit/glue/plugins/npapi_extension_thunk.h
@@ -2,24 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_NPAPI_EXTENSION_THUNK_H_
-#define WEBKIT_PLUGINS_NPAPI_NPAPI_EXTENSION_THUNK_H_
+#ifndef WEBKIT_GLUE_PLUGINS_NPAPI_EXTENSION_THUNK_H_
+#define WEBKIT_GLUE_PLUGINS_NPAPI_EXTENSION_THUNK_H_
 
 #include "third_party/npapi/bindings/npapi_extensions.h"
 
 // This file implements forwarding for the NPAPI "Pepper" extensions through to
 // the WebPluginDelegate associated with the plugin.
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 // Implements NPN_GetValue for the case of NPNVPepperExtensions. The function
 // pointers in the returned structure implement all the extensions.
 NPError GetPepperExtensionsFunctions(void* value);
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI
 
-#endif  // WEBKIT_PLUGINS_NPAPI_NPAPI_EXTENSION_THUNK_H_
+#endif  // WEBKIT_GLUE_PLUGINS_NPAPI_EXTENSION_THUNK_H_