Revert WebURLLoader landing. Too many layout test failures.

TBR=dglazkov

Review URL: http://codereview.chromium.org/115973

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17293 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 65 insertions, 106 deletions

diff --git a/webkit/glue/webplugin_impl_unittest.cc b/webkit/glue/webplugin_impl_unittest.cc
index b6c62f6..b518361 100644
--- a/webkit/glue/webplugin_impl_unittest.cc
+++ b/webkit/glue/webplugin_impl_unittest.cc
@@ -4,21 +4,18 @@
 
 #include "config.h"
 
-// Avoid collisions with the LOG macro
-#include <wtf/Assertions.h>
+#include "testing/gtest/include/gtest/gtest.h"
+
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
+#include "ResourceRequest.h"
+#include "CString.h"
+MSVC_POP_WARNING();
 #undef LOG
 
-#include "base/string_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/api/public/WebString.h"
-#include "webkit/api/public/WebURLRequest.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webplugin_impl.h"
 
-using WebKit::WebHTTPBody;
-using WebKit::WebString;
-using WebKit::WebURLRequest;
-
 namespace {
 
 class WebPluginImplTest : public testing::Test {
@@ -33,34 +30,6 @@ std::ostream& operator<<(std::ostream& out, const WebCore::String& str)
   return out << str.latin1().data();
 }
 
-static std::string GetHeader(const WebURLRequest& request, const char* name) {
-  std::string result;
-  TrimWhitespace(
-      webkit_glue::WebStringToStdString(
-          request.httpHeaderField(WebString::fromUTF8(name))),
-      TRIM_ALL,
-      &result);
-  return result;
-}
-
-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;
-}
-
 // The Host functions for NPN_PostURL and NPN_PostURLNotify
 // need to parse out some HTTP headers.  Make sure it works
 // with the following tests
@@ -68,47 +37,46 @@ static std::string GetBodyText(const WebURLRequest& request) {
 TEST(WebPluginImplTest, PostParserSimple) {
   // Test a simple case with headers & data
   const char *ex1 = "foo: bar\nContent-length: 10\n\nabcdefghij";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ("bar", GetHeader(request, "foo"));
-  EXPECT_EQ(0U, GetHeader(request, "bar").length());
-  EXPECT_EQ(0U, GetHeader(request, "Content-length").length());
-  EXPECT_EQ("abcdefghij", GetBodyText(request));
+  EXPECT_EQ("bar", request.httpHeaderField("foo").stripWhiteSpace());
+  EXPECT_EQ(0U, request.httpHeaderField("bar").length());
+  EXPECT_EQ(0U, request.httpHeaderField("Content-length").length());
+  EXPECT_EQ("abcdefghij", request.httpBody()->flattenToString());
 }
 
 TEST(WebPluginImplTest, PostParserLongHeader) {
   // Test a simple case with long headers
   const char *ex1 = "foo: 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\n\nabcdefghij";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ(100U, GetHeader(request, "foo").length());
+  EXPECT_EQ(100U, request.httpHeaderField("foo").stripWhiteSpace().length());
 }
 
 TEST(WebPluginImplTest, PostParserManyHeaders) {
   // Test a simple case with long headers
   const char *ex1 = "h1:h1\nh2:h2\nh3:h3\nh4:h4\nh5:h5\nh6:h6\nh7:h7\nh8:h8\nh9:h9\nh10:h10\n\nbody";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ("h1", GetHeader(request, "h1"));
-  EXPECT_EQ("h2", GetHeader(request, "h2"));
-  EXPECT_EQ("h3", GetHeader(request, "h3"));
-  EXPECT_EQ("h4", GetHeader(request, "h4"));
-  EXPECT_EQ("h5", GetHeader(request, "h5"));
-  EXPECT_EQ("h6", GetHeader(request, "h6"));
-  EXPECT_EQ("h7", GetHeader(request, "h7"));
-  EXPECT_EQ("h8", GetHeader(request, "h8"));
-  EXPECT_EQ("h9", GetHeader(request, "h9"));
-  EXPECT_EQ("h10", GetHeader(request, "h10"));
-  EXPECT_EQ("body", GetBodyText(request));
+  EXPECT_EQ("h1", request.httpHeaderField("h1").stripWhiteSpace());
+  EXPECT_EQ("h2", request.httpHeaderField("h2").stripWhiteSpace());
+  EXPECT_EQ("h3", request.httpHeaderField("h3").stripWhiteSpace());
+  EXPECT_EQ("h4", request.httpHeaderField("h4").stripWhiteSpace());
+  EXPECT_EQ("h5", request.httpHeaderField("h5").stripWhiteSpace());
+  EXPECT_EQ("h6", request.httpHeaderField("h6").stripWhiteSpace());
+  EXPECT_EQ("h7", request.httpHeaderField("h7").stripWhiteSpace());
+  EXPECT_EQ("h8", request.httpHeaderField("h8").stripWhiteSpace());
+  EXPECT_EQ("h9", request.httpHeaderField("h9").stripWhiteSpace());
+  EXPECT_EQ("h10", request.httpHeaderField("h10").stripWhiteSpace());
+  WebCore::FormData *form_data = request.httpBody();
+  WebCore::String string_data = form_data->flattenToString();
+  EXPECT_EQ(string_data, "body");
 }
 
 TEST(WebPluginImplTest, PostParserDuplicateHeaders) {
@@ -116,8 +84,7 @@ TEST(WebPluginImplTest, PostParserDuplicateHeaders) {
   // What value gets returned doesn't really matter.  It shouldn't error
   // out.
   const char *ex1 = "h1:h1\nh1:h2\n\nbody";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
@@ -126,47 +93,43 @@ TEST(WebPluginImplTest, PostParserDuplicateHeaders) {
 TEST(WebPluginImplTest, PostParserNoHeaders) {
   // Test a simple case with no headers but with data
   const char *ex1 = "\nabcdefghij";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ(0U, GetHeader(request, "foo").length());
-  EXPECT_EQ(0U, GetHeader(request, "bar").length());
-  EXPECT_EQ(0U, GetHeader(request, "Content-length").length());
-  EXPECT_EQ("abcdefghij", GetBodyText(request));
+  EXPECT_EQ(0U, request.httpHeaderField("foo").length());
+  EXPECT_EQ(0U, request.httpHeaderField("bar").length());
+  EXPECT_EQ(0U, request.httpHeaderField("Content-length").length());
+  EXPECT_EQ("abcdefghij", request.httpBody()->flattenToString());
 }
 
 TEST(WebPluginImplTest, PostParserNoBody) {
   // Test a simple case with headers and no body
   const char *ex1 = "Foo:bar\n\n";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ("bar", GetHeader(request, "foo"));
-  EXPECT_EQ(0U, GetHeader(request, "bar").length());
-  EXPECT_EQ(0U, GetHeader(request, "Content-length").length());
-  EXPECT_EQ(0U, GetBodyText(request).length());
+  EXPECT_EQ("bar", request.httpHeaderField("foo").stripWhiteSpace());
+  EXPECT_EQ(0U, request.httpHeaderField("bar").length());
+  EXPECT_EQ(0U, request.httpHeaderField("Content-length").length());
+  EXPECT_EQ(0U, request.httpBody()->flattenToString().length());
 }
 
 TEST(WebPluginImplTest, PostParserBodyWithNewLines) {
   // Test a simple case with headers and no body
   const char *ex1 = "Foo:bar\n\n\n\nabcdefg\n\nabcdefg";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ(GetBodyText(request), "\n\nabcdefg\n\nabcdefg");
+  EXPECT_EQ(request.httpBody()->flattenToString(), "\n\nabcdefg\n\nabcdefg");
 }
 
 TEST(WebPluginImplTest, PostParserErrorNoBody) {
   // Test with headers and no body
   const char *ex1 = "Foo:bar\n";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
@@ -175,8 +138,7 @@ TEST(WebPluginImplTest, PostParserErrorNoBody) {
 TEST(WebPluginImplTest, PostParserErrorEmpty) {
   // Test with an empty string
   const char *ex1 = "";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
@@ -185,39 +147,36 @@ TEST(WebPluginImplTest, PostParserErrorEmpty) {
 TEST(WebPluginImplTest, PostParserEmptyName) {
   // Test an error case with an empty header name field
   const char *ex1 = "foo:bar\n:blat\n\nbody";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ("bar", GetHeader(request, "foo"));
-  EXPECT_EQ("body", GetBodyText(request));
+  EXPECT_EQ("bar", request.httpHeaderField("foo").stripWhiteSpace());
+  EXPECT_EQ("body", request.httpBody()->flattenToString());
 }
 
 TEST(WebPluginImplTest, PostParserEmptyValue) {
   // Test an error case with an empty value field
   const char *ex1 = "foo:bar\nbar:\n\nbody";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ("bar", GetHeader(request, "foo"));
-  EXPECT_EQ(0U, GetHeader(request, "bar").length());
-  EXPECT_EQ("body", GetBodyText(request));
+  EXPECT_EQ("bar", request.httpHeaderField("foo").stripWhiteSpace());
+  EXPECT_EQ(0U, request.httpHeaderField("bar").length());
+  EXPECT_EQ("body", request.httpBody()->flattenToString());
 }
 
 TEST(WebPluginImplTest, PostParserCRLF) {
   // Test an error case with an empty value field
   const char *ex1 = "foo: bar\r\nbar:\r\n\r\nbody\r\n\r\nbody2";
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ("bar", GetHeader(request, "foo"));
-  EXPECT_EQ(0U, GetHeader(request, "bar").length());
-  EXPECT_EQ("body\r\n\r\nbody2", GetBodyText(request));
+  EXPECT_EQ("bar", request.httpHeaderField("foo").stripWhiteSpace());
+  EXPECT_EQ(0U, request.httpHeaderField("bar").length());
+  EXPECT_EQ("body\r\n\r\nbody2", request.httpBody()->flattenToString());
 }
 
 TEST(WebPluginImplTest, PostParserBodyWithBinaryData) {
@@ -227,19 +186,19 @@ TEST(WebPluginImplTest, PostParserBodyWithBinaryData) {
   memcpy(ex1 + strlen("foo: bar\nContent-length: 10\n\n"), &binary_data,
         sizeof(binary_data));
 
-  WebURLRequest request;
-  request.initialize();
+  WebCore::ResourceRequest request;
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                       sizeof(ex1)/sizeof(ex1[0]));
   EXPECT_EQ(true, rv);
-  EXPECT_EQ("bar", GetHeader(request, "foo"));
-  EXPECT_EQ(0U, GetHeader(request, "bar").length());
-  EXPECT_EQ(0U, GetHeader(request, "Content-length").length());
+  EXPECT_EQ("bar", request.httpHeaderField("foo").stripWhiteSpace());
+  EXPECT_EQ(0U, request.httpHeaderField("bar").length());
+  EXPECT_EQ(0U, request.httpHeaderField("Content-length").length());
 
-  std::string body = GetBodyText(request);
+  Vector<char> expected_data;
+  request.httpBody()->flatten(expected_data);
 
-  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]);
+  EXPECT_EQ(0xF0, (unsigned char)expected_data[0]);
+  EXPECT_EQ(0xFF, (unsigned char)expected_data[1]);
+  EXPECT_EQ(0xFF, (unsigned char)expected_data[2]);
+  EXPECT_EQ(0xFF, (unsigned char)expected_data[3]);
 }