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

webkit/glue/plugins/webplugin.h

Index: webkit/glue/plugins/webplugin.h
diff --git a/webkit/plugins/npapi/webplugin.h b/webkit/glue/plugins/webplugin.h
similarity index 96%
rename from webkit/plugins/npapi/webplugin.h
rename to webkit/glue/plugins/webplugin.h
index c5969497c24cbd306f329fe56f0add8c217fc02f..8a6102705c365af11b1557d5570f3af3d11a4432 100644
--- a/webkit/plugins/npapi/webplugin.h
+++ b/webkit/glue/plugins/webplugin.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // 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_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
+#ifndef WEBKIT_GLUE_WEBPLUGIN_H_
+#define WEBKIT_GLUE_WEBPLUGIN_H_
 
 #include <string>
 #include <vector>
@@ -24,8 +24,7 @@ namespace WebKit {
 class WebFrame;
 }
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 class WebPluginDelegate;
 class WebPluginParentView;
@@ -196,7 +195,6 @@ class WebPluginResourceClient {
   virtual int ResourceId() = 0;
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
+#endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_H_