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

webkit/glue/plugins/webplugin_delegate.h

Index: webkit/glue/plugins/webplugin_delegate.h
diff --git a/webkit/plugins/npapi/webplugin_delegate.h b/webkit/glue/plugins/webplugin_delegate.h
similarity index 92%
rename from webkit/plugins/npapi/webplugin_delegate.h
rename to webkit/glue/plugins/webplugin_delegate.h
index ff604ed4aedc93e0e64e10fa77098101298e13fc..ac7bb5cdc7a926558b298c62e0b5e4d8f9d12b63 100644
--- a/webkit/plugins/npapi/webplugin_delegate.h
+++ b/webkit/glue/plugins/webplugin_delegate.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_DELEGATE_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_H_
+#ifndef WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_
+#define WEBKIT_GLUE_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/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"
+#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"
 
 class FilePath;
 class GURL;
@@ -33,8 +33,7 @@ namespace gfx {
 class Rect;
 }
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 class WebPlugin;
 class WebPluginResourceClient;
@@ -162,7 +161,6 @@ class WebPluginDelegate : public WebPlugin2DDeviceDelegate,
   virtual string16 GetSelectionAsMarkup() const;
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_H_
+#endif  // WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_