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

webkit/plugins/npapi/webplugin_delegate.h

Index: webkit/plugins/npapi/webplugin_delegate.h
===================================================================
--- webkit/plugins/npapi/webplugin_delegate.h	(revision 0)
+++ webkit/plugins/npapi/webplugin_delegate.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_DELEGATE_H_
-#define WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_H_
+#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_H_
 
 #include <string>
 #include <vector>
@@ -14,11 +14,11 @@
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
-#include "webkit/glue/plugins/webplugin_2d_device_delegate.h"
-#include "webkit/glue/plugins/webplugin_3d_device_delegate.h"
-#include "webkit/glue/plugins/webplugin_audio_device_delegate.h"
-#include "webkit/glue/plugins/webplugin_file_delegate.h"
-#include "webkit/glue/plugins/webplugin_print_delegate.h"
+#include "webkit/plugins/npapi/webplugin_2d_device_delegate.h"
+#include "webkit/plugins/npapi/webplugin_3d_device_delegate.h"
+#include "webkit/plugins/npapi/webplugin_audio_device_delegate.h"
+#include "webkit/plugins/npapi/webplugin_file_delegate.h"
+#include "webkit/plugins/npapi/webplugin_print_delegate.h"
 
 class FilePath;
 class GURL;
@@ -33,7 +33,8 @@
 class Rect;
 }
 
-namespace webkit_glue {
+namespace webkit {
+namespace npapi {
 
 class WebPlugin;
 class WebPluginResourceClient;
@@ -161,6 +162,7 @@
   virtual string16 GetSelectionAsMarkup() const;
 };
 
-}  // namespace webkit_glue
+}  // namespace npapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_
+#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_H_