Release the cache entry on deferred redirect.

net/url_request/url_request_unittest.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 4185 matching lines @@
   URLRequest req(
       test_server_.GetURL("echoheader?Referer"), &d, &default_context_);
   req.SetReferrer("http://foo.com/test#fragment");
   req.SetReferrer("");
   req.Start();
   base::RunLoop().Run();
 
   EXPECT_EQ(std::string("None"), d.data_received());
 }
 
+

[mmenke, 2013/09/16 20:41:08]

nit:  Remove extra blank line.

[davidben, 2013/09/16 22:00:00]

Done.

+TEST_F(URLRequestTestHTTP, CachedRedirect) {

[mmenke, 2013/09/16 20:41:08]

Maybe a second test where the redirect has a non-empty body?

[davidben, 2013/09/16 22:00:00]

Are you sure it doesn't already have a non-empty body? redirect-test.html says
"hello" in it.

[mmenke, 2013/09/16 22:08:59]

Looks like you're right.  I saw the mock-headers, which don't have a
Content-Length line, and just assumed there was no body.  Our tests violate the
HTTP/1.1 spec (Though they'd still be in violation with a 0-length body, too). 
:(  Server should claim HTTP/1.0 or be sending a Content-Length header,
dagnabit!

+  ASSERT_TRUE(test_server_.Start());
+
+  // Write to the cache.
+  {
+    TestDelegate d;
+    GURL test_url(test_server_.GetURL("files/redirect-test.html"));
+    URLRequest req(test_url, &d, &default_context_);
+
+    req.Start();
+    base::RunLoop().Run();
+
+    EXPECT_EQ(1, d.received_redirect_count());
+    EXPECT_EQ(1, d.response_started_count());
+    EXPECT_FALSE(d.received_data_before_response());
+    EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status());
+  }
+
+  // Stop at the redirect and make sure it was read from cache.
+  {
+    TestDelegate d;
+    d.set_quit_on_redirect(true);
+    GURL test_url(test_server_.GetURL("files/redirect-test.html"));
+    URLRequest req(test_url, &d, &default_context_);
+
+    req.Start();
+    base::RunLoop().Run();
+
+    EXPECT_EQ(1, d.received_redirect_count());
+    EXPECT_TRUE(req.was_cached());
+  }
+}
+
 TEST_F(URLRequestTestHTTP, CancelRedirect) {
   ASSERT_TRUE(test_server_.Start());
 
   TestDelegate d;
   {
     d.set_cancel_in_received_redirect(true);
     URLRequest req(
         test_server_.GetURL("files/redirect-test.html"), &d, &default_context_);
     req.Start();
     base::RunLoop().Run();
@@ skipping 74 matching lines @@
     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(base::ReadFileToString(path, &contents));
     EXPECT_EQ(contents, d.data_received());
   }
 }
 
+// Tests that a deferred redirect releases its lock on the cache.
+TEST_F(URLRequestTestHTTP, DeferredRedirect_ReleaseCacheEntry) {
+  ASSERT_TRUE(test_server_.Start());
+
+  // First test the cold cache case.
+  {
+    TestDelegate d_defer, d;

[mmenke, 2013/09/16 20:41:08]

nit:  Define one variable per line.

[mmenke, 2013/09/16 20:41:08]

nit:  While this file name TestDelegates "d" a lot (In violation of Google
style), I think "d_defer" is going a bit too far.  Suggest just writing it out
as "delegate".

[davidben, 2013/09/16 22:00:00]

Done.

[davidben, 2013/09/16 22:00:00]

Done.

+
+    // First, fire a request that defers its redirect.
+    d_defer.set_quit_on_redirect(true);
+    GURL test_url(test_server_.GetURL("files/redirect-test.html"));
+    URLRequest req_defer(test_url, &d_defer, &default_context_);

[mmenke, 2013/09/16 20:41:08]

optional:  Suggest "deferred_req" and "deferring_delegate".  Think it makes the
relationship clearer.

[davidben, 2013/09/16 22:00:00]

Done.

+    req_defer.Start();
+    base::RunLoop().Run();
+    EXPECT_EQ(1, d_defer.received_redirect_count());
+
+    // This should test the cold cache case.
+    EXPECT_FALSE(req_defer.was_cached());
+
+    // Now, fire a second at the same. It should not get stuck.
+    URLRequest req(test_url, &d, &default_context_);
+    req.Start();
+    base::RunLoop().Run();
+    EXPECT_EQ(1, d.response_started_count());
+    EXPECT_FALSE(d.received_data_before_response());
+    EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status());

[mmenke, 2013/09/16 20:41:08]

May want to mention something about the "deferred" redirect never being result -
think that some contradicts the word "deferred".  Or could rename it to
"indefinitely_defered_redirect" or something - open to better ideas.  Maybe
"paused_"?  "Halted" implies too much of a full stop...

[davidben, 2013/09/16 22:00:00]

Went with paused.

+  }
+
+  // Repeat, now with the cache warmed from the last run.
+  {
+    TestDelegate d_defer, d;
+
+    // First, fire a request that defers its redirect.
+    d_defer.set_quit_on_redirect(true);
+    GURL test_url(test_server_.GetURL("files/redirect-test.html"));
+    URLRequest req_defer(test_url, &d_defer, &default_context_);
+    req_defer.Start();
+    base::RunLoop().Run();
+    EXPECT_EQ(1, d_defer.received_redirect_count());
+
+    // This should test the warm cache case.
+    EXPECT_TRUE(req_defer.was_cached());
+
+    // Now, fire a second at the same. It should not get stuck.
+    URLRequest req(test_url, &d, &default_context_);
+    req.Start();
+    base::RunLoop().Run();
+    EXPECT_EQ(1, d.response_started_count());
+    EXPECT_FALSE(d.received_data_before_response());
+    EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status());
+  }
+}
+
 TEST_F(URLRequestTestHTTP, CancelDeferredRedirect) {
   ASSERT_TRUE(test_server_.Start());
 
   TestDelegate d;
   {
     d.set_quit_on_redirect(true);
     URLRequest req(
         test_server_.GetURL("files/redirect-test.html"), &d, &default_context_);
     req.Start();
     base::RunLoop().Run();
@@ skipping 1976 matching lines @@
 
     EXPECT_FALSE(r.is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
 }  // namespace net