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

webkit/plugins/npapi/webplugin_impl.h

Index: webkit/plugins/npapi/webplugin_impl.h
===================================================================
--- webkit/plugins/npapi/webplugin_impl.h	(revision 0)
+++ webkit/plugins/npapi/webplugin_impl.h	(working copy)
@@ -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_GLUE_WEBPLUGIN_IMPL_H_
-#define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
+#define WEBKIT_PLUGINS_NPAPI_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/glue/plugins/webplugin.h"
+#include "webkit/plugins/npapi/webplugin.h"
 
 class WebViewDelegate;
 
@@ -35,8 +35,12 @@
 }
 
 namespace webkit_glue {
+class MultipartResponseDelegate;
+}  // namespace webkit_glue
 
-class MultipartResponseDelegate;
+namespace webkit {
+namespace npapi {
+
 class WebPluginDelegate;
 class WebPluginPageDelegate;
 
@@ -325,6 +329,7 @@
   DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
 };
 
-}  // namespace webkit_glue
+}  // namespace npapi
+}  // namespace webkit
 
-#endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
+#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_