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

webkit/glue/plugins/webplugin_impl.h

Index: webkit/glue/plugins/webplugin_impl.h
diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/glue/plugins/webplugin_impl.h
similarity index 97%
rename from webkit/plugins/npapi/webplugin_impl.h
rename to webkit/glue/plugins/webplugin_impl.h
index c1115dc01bea7a2f2c0f18069030f914149afd5e..27a692b90be4b2c736a2d964f5e6d53ccf9c6286 100644
--- a/webkit/plugins/npapi/webplugin_impl.h
+++ b/webkit/glue/plugins/webplugin_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
+#ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
+#define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
 
 #include <string>
 #include <map>
@@ -21,7 +21,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
-#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 class WebViewDelegate;
 
@@ -35,12 +35,8 @@ class WebURLRequest;
 }
 
 namespace webkit_glue {
-class MultipartResponseDelegate;
-}  // namespace webkit_glue
-
-namespace webkit {
-namespace npapi {
 
+class MultipartResponseDelegate;
 class WebPluginDelegate;
 class WebPluginPageDelegate;
 
@@ -329,7 +325,6 @@ class WebPluginImpl : public WebPlugin,
   DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
+#endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_