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

webkit/glue/plugins/webview_plugin.cc

Index: webkit/glue/plugins/webview_plugin.cc
diff --git a/webkit/plugins/npapi/webview_plugin.cc b/webkit/glue/plugins/webview_plugin.cc
similarity index 98%
rename from webkit/plugins/npapi/webview_plugin.cc
rename to webkit/glue/plugins/webview_plugin.cc
index 6788fc5a51a655bec2baaae583a39fc2503c3797..f89ccb45f5292a66bbfc19aa1603ca464dee265d 100644
--- a/webkit/plugins/npapi/webview_plugin.cc
+++ b/webkit/glue/plugins/webview_plugin.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/webview_plugin.h"
+#include "webkit/glue/plugins/webview_plugin.h"
 
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ -43,9 +43,6 @@ using WebKit::WebURLResponse;
 using WebKit::WebVector;
 using WebKit::WebView;
 
-namespace webkit {
-namespace npapi {
-
 WebViewPlugin::WebViewPlugin(WebViewPlugin::Delegate* delegate)
     : delegate_(delegate),
       container_(NULL),
@@ -236,6 +233,3 @@ WebURLError WebViewPlugin::cancelledError(WebFrame* frame,
   error.unreachableURL = request.url();
   return error;
 }
-
-}  // namespace npapi
-}  // namespace webkit