Do cookie checks in NetworkDelegate instead of the URLRequest::Delegate.

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 <shlobj.h>
 #include <windows.h>
 #endif
@@ skipping 2543 matching lines @@
     // Make sure we sent the cookie in the restarted transaction.
     EXPECT_TRUE(d.data_received().find("Cookie: got_challenged=true")
         != std::string::npos);
   }
 }
 
 TEST_F(URLRequestTest, DelayedCookieCallback) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
+  TestNetworkDelegate network_delegate;  // must outlive URLRequests
   scoped_refptr<URLRequestContext> context(new TestURLRequestContext());
+  context->set_network_delegate(&network_delegate);
   scoped_refptr<DelayedCookieMonster> delayed_cm =
       new DelayedCookieMonster();
   scoped_refptr<CookieStore> cookie_store = delayed_cm;
   context->set_cookie_store(delayed_cm);
 
   // Set up a cookie.
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
     req.set_context(context);
     req.Start();
     MessageLoop::current()->Run();
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
-    EXPECT_EQ(1, d.set_cookie_count());
+    EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
+    EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
+    EXPECT_EQ(1, network_delegate.set_cookie_count());
   }
 
   // Verify that the cookie is set.
   {
+    network_delegate.ResetCookieCounters();

[willchan no longer on Chromium, 2012/03/01 20:30:10]

I don't know that I like this as much. Can we just create a new
TestNetworkDelegate within the block scopes?

     TestDelegate d;
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(context);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("CookieToNotSend=1")
                 != std::string::npos);
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
+    EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
   }
 }
 
 TEST_F(URLRequestTest, DoNotSendCookies) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
   // Set up a cookie.
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Verify that the cookie is set.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("CookieToNotSend=1")
                 != std::string::npos);
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Verify that the cookie isn't sent when LOAD_DO_NOT_SEND_COOKIES is set.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_load_flags(LOAD_DO_NOT_SEND_COOKIES);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1")
                 == std::string::npos);
 
     // LOAD_DO_NOT_SEND_COOKIES does not trigger OnGetCookies.
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 }
 
 TEST_F(URLRequestTest, DoNotSaveCookies) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
   // Set up a cookie.
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
-    EXPECT_EQ(1, d.set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
+    EXPECT_EQ(1, default_network_delegate_.set_cookie_count());
   }
 
   // Try to set-up another cookie and update the previous cookie.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
     URLRequest req(test_server.GetURL(
         "set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
     req.set_load_flags(LOAD_DO_NOT_SAVE_COOKIES);
     req.set_context(default_context_);
     req.Start();
 
     MessageLoop::current()->Run();
 
     // LOAD_DO_NOT_SAVE_COOKIES does not trigger OnSetCookie.
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
-    EXPECT_EQ(0, d.set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.set_cookie_count());
   }
 
   // Verify the cookies weren't saved or updated.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("CookieToNotSave=1")
                 == std::string::npos);
     EXPECT_TRUE(d.data_received().find("CookieToNotUpdate=2")
                 != std::string::npos);
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
-    EXPECT_EQ(0, d.set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.set_cookie_count());
   }
 }
 
 TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
   // Set up a cookie.
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Verify that the cookie is set.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("CookieToNotSend=1")
                 != std::string::npos);
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Verify that the cookie isn't sent.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
-    d.set_cookie_options(TestDelegate::NO_GET_COOKIES);
+    default_network_delegate_.set_cookie_options(
+        TestNetworkDelegate::NO_GET_COOKIES);
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1")
                 == std::string::npos);
 
-    EXPECT_EQ(1, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(1, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 }
 
 TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
   // Set up a cookie.
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),  &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Try to set-up another cookie and update the previous cookie.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
-    d.set_cookie_options(TestDelegate::NO_SET_COOKIE);
+    default_network_delegate_.set_cookie_options(
+        TestNetworkDelegate::NO_SET_COOKIE);
     URLRequest req(test_server.GetURL(
         "set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
     req.set_context(default_context_);
     req.Start();
 
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(2, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(2, default_network_delegate_.blocked_set_cookie_count());
   }
 
 
   // Verify the cookies weren't saved or updated.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("CookieToNotSave=1")
                 == std::string::npos);
     EXPECT_TRUE(d.data_received().find("CookieToNotUpdate=2")
                 != std::string::npos);
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 }
 
 TEST_F(URLRequestTest, DoNotSaveEmptyCookies) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
   // Set up an empty cookie.
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("set-cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
-    EXPECT_EQ(0, d.set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.set_cookie_count());
   }
 }
 
 TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
   // Set up a cookie.
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Verify that the cookie is set.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("CookieToNotSend=1")
                 != std::string::npos);
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Verify that the cookie isn't sent.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
-    d.set_cookie_options(TestDelegate::NO_GET_COOKIES);
+    default_network_delegate_.set_cookie_options(
+        TestNetworkDelegate::NO_GET_COOKIES);
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1")
                 == std::string::npos);
 
-    EXPECT_EQ(1, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(1, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 }
 
 TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
   // Set up a cookie.
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Try to set-up another cookie and update the previous cookie.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
-    d.set_cookie_options(TestDelegate::NO_SET_COOKIE);
+    default_network_delegate_.set_cookie_options(
+        TestNetworkDelegate::NO_SET_COOKIE);
     URLRequest req(test_server.GetURL(
         "set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
     req.set_context(default_context_);
     req.Start();
 
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(2, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(2, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Verify the cookies weren't saved or updated.
   {
+    default_network_delegate_.ResetCookieCounters();
     TestDelegate d;
     TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
     req.set_context(default_context_);
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("CookieToNotSave=1")
                 == std::string::npos);
     EXPECT_TRUE(d.data_received().find("CookieToNotUpdate=2")
                 != std::string::npos);
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 }
 
 void CheckCookiePolicyCallback(bool* was_run, const CookieList& cookies) {
   EXPECT_EQ(1U, cookies.size());
   EXPECT_FALSE(cookies[0].IsPersistent());
   *was_run = true;
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 TEST_F(URLRequestTest, CookiePolicy_ForceSession) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
 
   // Set up a cookie.
   {
     TestDelegate d;
-    d.set_cookie_options(TestDelegate::FORCE_SESSION);
+    default_network_delegate_.set_cookie_options(
+        TestNetworkDelegate::FORCE_SESSION);
     URLRequest req(test_server.GetURL(
         "set-cookie?A=1;expires=\"Fri, 05 Feb 2010 23:42:01 GMT\""), &d);
     req.set_context(default_context_);
     req.Start();  // Triggers an asynchronous cookie policy check.
 
     MessageLoop::current()->Run();
 
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+    EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
   }
 
   // Now, check the cookie store.
   bool was_run = false;
   default_context_->cookie_store()->GetCookieMonster()->GetAllCookiesAsync(
       base::Bind(&CheckCookiePolicyCallback, &was_run));
   MessageLoop::current()->RunAllPending();
   DCHECK(was_run);
 }
 
@@ skipping 1195 matching lines @@
   req.SetExtraRequestHeaders(headers);
   req.Start();
   MessageLoop::current()->Run();
   // If the net tests are being run with ChromeFrame then we need to allow for
   // the 'chromeframe' suffix which is added to the user agent before the
   // closing parentheses.
   EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true));
 }
 
 }  // namespace net