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

webkit/glue/plugins/webplugin_impl_unittest.cc

Index: webkit/glue/plugins/webplugin_impl_unittest.cc
diff --git a/webkit/plugins/npapi/webplugin_impl_unittest.cc b/webkit/glue/plugins/webplugin_impl_unittest.cc
similarity index 96%
rename from webkit/plugins/npapi/webplugin_impl_unittest.cc
rename to webkit/glue/plugins/webplugin_impl_unittest.cc
index 45d4ddc91b20e2a211c9d663aa89d161d4b0da71..e70e39a397ec4a725e1cc231a50589ae9755c25a 100644
--- a/webkit/plugins/npapi/webplugin_impl_unittest.cc
+++ b/webkit/glue/plugins/webplugin_impl_unittest.cc
@@ -7,18 +7,21 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
-#include "webkit/plugins/npapi/webplugin_impl.h"
+#include "webkit/glue/plugins/webplugin_impl.h"
 
 using WebKit::WebHTTPBody;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
-
-namespace webkit {
-namespace npapi {
+using webkit_glue::WebPluginImpl;
 
 namespace {
 
-std::string GetHeader(const WebURLRequest& request, const char* name) {
+class WebPluginImplTest : public testing::Test {
+};
+
+}
+
+static std::string GetHeader(const WebURLRequest& request, const char* name) {
   std::string result;
   TrimWhitespace(
       request.httpHeaderField(WebString::fromUTF8(name)).utf8(),
@@ -27,7 +30,7 @@ std::string GetHeader(const WebURLRequest& request, const char* name) {
   return result;
 }
 
-std::string GetBodyText(const WebURLRequest& request) {
+static std::string GetBodyText(const WebURLRequest& request) {
   const WebHTTPBody& body = request.httpBody();
   if (body.isNull())
     return std::string();
@@ -45,8 +48,6 @@ std::string GetBodyText(const WebURLRequest& request) {
   return result;
 }
 
-}  // namespace
-
 // The Host functions for NPN_PostURL and NPN_PostURLNotify
 // need to parse out some HTTP headers.  Make sure it works
 // with the following tests
@@ -229,6 +230,3 @@ TEST(WebPluginImplTest, PostParserBodyWithBinaryData) {
   EXPECT_EQ(0xFF, (unsigned char)body[2]);
   EXPECT_EQ(0xFF, (unsigned char)body[3]);
 }
-
-}  // namespace npapi
-}  // namespace webkit