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

webkit/glue/plugins/webplugin_impl_unittest.cc

 // Copyright (c) 2010 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.
 
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #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(),
       TRIM_ALL,
       &result);
   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();
 
   std::string result;
   size_t i = 0;
   WebHTTPBody::Element element;
   while (body.elementAt(i++, element)) {
     if (element.type == WebHTTPBody::Element::TypeData) {
       result.append(element.data.data(), element.data.size());
     } else {
       NOTREACHED() << "unexpected element type encountered!";
     }
   }
   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
 
 TEST(WebPluginImplTest, PostParserSimple) {
   // Test a simple case with headers & data
   const char *ex1 = "foo: bar\nContent-length: 10\n\nabcdefghij";
   WebURLRequest request;
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
@@ skipping 162 matching lines @@
   EXPECT_EQ(0U, GetHeader(request, "bar").length());
   EXPECT_EQ(0U, GetHeader(request, "Content-length").length());
 
   std::string body = GetBodyText(request);
 
   EXPECT_EQ(0xF0, (unsigned char)body[0]);
   EXPECT_EQ(0xFF, (unsigned char)body[1]);
   EXPECT_EQ(0xFF, (unsigned char)body[2]);
   EXPECT_EQ(0xFF, (unsigned char)body[3]);
 }
-
-}  // namespace npapi
-}  // namespace webkit