Revert r23616 from 172.

net/url_request/url_request_unittest.cc

 // Copyright (c) 2006-2008 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 "net/url_request/url_request_unittest.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #elif defined(OS_LINUX)
 #include "base/nss_init.h"
 #endif
 
 #include <algorithm>
 #include <string>
 
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_module.h"
 #include "net/base/net_util.h"
 #include "net/base/ssl_test_util.h"
-#include "net/base/upload_data.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 using base::Time;
@@ skipping 34 matching lines @@
 bool ContainsString(const std::string& haystack, const char* needle) {
   std::string::const_iterator it =
       std::search(haystack.begin(),
                   haystack.end(),
                   needle,
                   needle + strlen(needle),
                   CaseInsensitiveCompare<char>());
   return it != haystack.end();
 }
 
-scoped_refptr<net::UploadData> CreateSimpleUploadData(const char* data) {
-  scoped_refptr<net::UploadData> upload = new net::UploadData;
-  upload->AppendBytes(data, strlen(data));
-  return upload;
-}
-
 }  // namespace
 
 // Inherit PlatformTest since we require the autorelease pool on Mac OS X.f
 class URLRequestTest : public PlatformTest {
 };
 
 TEST_F(URLRequestTest, ProxyTunnelRedirectTest) {
   // In this unit test, we're using the HTTPTestServer as a proxy server and
   // issuing a CONNECT request with the magic host name "www.redirect.com".
   // The HTTPTestServer will return a 302 response, which we should not
@@ skipping 794 matching lines @@
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_EQ(1, d.response_started_count());
     EXPECT_EQ(0, d.bytes_received());
     EXPECT_FALSE(d.received_data_before_response());
     EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status());
   }
 }
 
-TEST_F(URLRequestTest, DeferredRedirect) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(L"net/data/url_request_unittest", NULL);
-  ASSERT_TRUE(NULL != server.get());
-  TestDelegate d;
-  {
-    d.set_quit_on_redirect(true);
-    TestURLRequest req(server->TestServerPage(
-        "files/redirect-test.html"), &d);
-    req.Start();
-    MessageLoop::current()->Run();
-
-    EXPECT_EQ(1, d.received_redirect_count());
-
-    req.FollowDeferredRedirect();
-    MessageLoop::current()->Run();
-
-    EXPECT_EQ(1, d.response_started_count());
-    EXPECT_FALSE(d.received_data_before_response());
-    EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status());
-
-    FilePath path;
-    PathService::Get(base::DIR_SOURCE_ROOT, &path);
-    path = path.Append(FILE_PATH_LITERAL("net"));
-    path = path.Append(FILE_PATH_LITERAL("data"));
-    path = path.Append(FILE_PATH_LITERAL("url_request_unittest"));
-    path = path.Append(FILE_PATH_LITERAL("with-headers.html"));
-
-    std::string contents;
-    EXPECT_TRUE(file_util::ReadFileToString(path, &contents));
-    EXPECT_EQ(contents, d.data_received());
-  }
-}
-
-TEST_F(URLRequestTest, CancelDeferredRedirect) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(L"net/data/url_request_unittest", NULL);
-  ASSERT_TRUE(NULL != server.get());
-  TestDelegate d;
-  {
-    d.set_quit_on_redirect(true);
-    TestURLRequest req(server->TestServerPage(
-        "files/redirect-test.html"), &d);
-    req.Start();
-    MessageLoop::current()->Run();
-
-    EXPECT_EQ(1, d.received_redirect_count());
-
-    req.Cancel();
-    MessageLoop::current()->Run();
-
-    EXPECT_EQ(1, d.response_started_count());
-    EXPECT_EQ(0, d.bytes_received());
-    EXPECT_FALSE(d.received_data_before_response());
-    EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status());
-  }
-}
-
 TEST_F(URLRequestTest, VaryHeader) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(L"net/data/url_request_unittest", NULL);
   ASSERT_TRUE(NULL != server.get());
 
   scoped_refptr<URLRequestContext> context = new URLRequestHttpCacheContext();
 
   Time response_time;
 
   // populate the cache
@@ skipping 145 matching lines @@
     EXPECT_TRUE(d.data_received().find("Cookie: got_challenged=true")
         != std::string::npos);
   }
 }
 
 // In this test, we do a POST which the server will 302 redirect.
 // The subsequent transaction should use GET, and should not send the
 // Content-Type header.
 // http://code.google.com/p/chromium/issues/detail?id=843
 TEST_F(URLRequestTest, Post302RedirectGet) {
-  const char kData[] = "hello world";
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(L"net/data/url_request_unittest", NULL);
   ASSERT_TRUE(NULL != server.get());
   TestDelegate d;
   TestURLRequest req(server->TestServerPage("files/redirect-to-echoall"), &d);
   req.set_method("POST");
-  req.set_upload(CreateSimpleUploadData(kData));
 
   // Set headers (some of which are specific to the POST).
+  // ("Content-Length: 10" is just a junk value to make sure it gets stripped).
   req.SetExtraRequestHeaders(
     "Content-Type: multipart/form-data; "
     "boundary=----WebKitFormBoundaryAADeAA+NAAWMAAwZ\r\n"
     "Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,"
     "text/plain;q=0.8,image/png,*/*;q=0.5\r\n"
     "Accept-Language: en-US,en\r\n"
     "Accept-Charset: ISO-8859-1,*,utf-8\r\n"
-    "Content-Length: 11\r\n"
+    "Content-Length: 10\r\n"
     "Origin: http://localhost:1337/");
   req.Start();
   MessageLoop::current()->Run();
 
   std::string mime_type;
   req.GetMimeType(&mime_type);
   EXPECT_EQ("text/html", mime_type);
 
   const std::string& data = d.data_received();
 
   // Check that the post-specific headers were stripped:
   EXPECT_FALSE(ContainsString(data, "Content-Length:"));
   EXPECT_FALSE(ContainsString(data, "Content-Type:"));
   EXPECT_FALSE(ContainsString(data, "Origin:"));
 
   // These extra request headers should not have been stripped.
   EXPECT_TRUE(ContainsString(data, "Accept:"));
   EXPECT_TRUE(ContainsString(data, "Accept-Language:"));
   EXPECT_TRUE(ContainsString(data, "Accept-Charset:"));
 }
 
-// TODO(darin): Re-enable this test once bug 16832 is fixed.
-TEST_F(URLRequestTest, DISABLED_Post307RedirectPost) {
-  const char kData[] = "hello world";
+TEST_F(URLRequestTest, Post307RedirectPost) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(L"net/data/url_request_unittest", NULL);
   ASSERT_TRUE(NULL != server.get());
   TestDelegate d;
-  TestURLRequest req(server->TestServerPage("files/redirect307-to-echo"),
+  TestURLRequest req(server->TestServerPage("files/redirect307-to-echoall"),
       &d);
   req.set_method("POST");
-  req.set_upload(CreateSimpleUploadData(kData).get());
-  req.SetExtraRequestHeaders(
-      "Content-Length: " + UintToString(sizeof(kData) - 1));
   req.Start();
   MessageLoop::current()->Run();
-  EXPECT_EQ("POST", req.method());
-  EXPECT_EQ(kData, d.data_received());
+  EXPECT_EQ(req.method(), "POST");
 }
 
 // FTP tests appear to be hanging some of the time
 #if 1  // !defined(OS_WIN)
   #define MAYBE_FTPGetTestAnonymous   DISABLED_FTPGetTestAnonymous
   #define MAYBE_FTPGetTest            DISABLED_FTPGetTest
   #define MAYBE_FTPCheckWrongUser     DISABLED_FTPCheckWrongUser
   #define MAYBE_FTPCheckWrongPassword DISABLED_FTPCheckWrongPassword
 #else
   #define MAYBE_FTPGetTestAnonymous   FTPGetTestAnonymous
@@ skipping 93 matching lines @@
 
     int64 file_size = 0;
     file_util::GetFileSize(app_path, &file_size);
 
     EXPECT_TRUE(!r.is_pending());
     EXPECT_EQ(1, d.response_started_count());
     EXPECT_FALSE(d.received_data_before_response());
     EXPECT_EQ(d.bytes_received(), 0);
   }
 }