Remove async functionality from net::CookiePolicy.

net/url_request/url_request_unittest.cc

 // Copyright (c) 2011 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>
 #elif defined(USE_NSS)
@@ skipping 1645 matching lines @@
 
     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());
   }
 
   // Verify that the cookie isn't sent.
   {
-    TestCookiePolicy cookie_policy(TestCookiePolicy::NO_GET_COOKIES |
-                                   TestCookiePolicy::ASYNC);
+    TestCookiePolicy cookie_policy(TestCookiePolicy::NO_GET_COOKIES);
     context->set_cookie_policy(&cookie_policy);
 
     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("Cookie: CookieToNotSend=1")
                 == std::string::npos);
@@ skipping 19 matching lines @@
     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());
   }
 
   // Try to set-up another cookie and update the previous cookie.
   {
-    TestCookiePolicy cookie_policy(TestCookiePolicy::NO_SET_COOKIE |
-                                   TestCookiePolicy::ASYNC);
+    TestCookiePolicy cookie_policy(TestCookiePolicy::NO_SET_COOKIE);
     context->set_cookie_policy(&cookie_policy);
 
     TestDelegate d;
     URLRequest req(test_server.GetURL(
         "set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
     req.set_context(context);
     req.Start();
 
     MessageLoop::current()->Run();
 
@@ skipping 14 matching lines @@
     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());
   }
 }
 
-TEST_F(URLRequestTest, CancelTest_During_CookiePolicy) {
-  TestServer test_server(TestServer::TYPE_HTTP, FilePath());
-  ASSERT_TRUE(test_server.Start());
-
-  scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext());
-
-  TestCookiePolicy cookie_policy(TestCookiePolicy::ASYNC);
-  context->set_cookie_policy(&cookie_policy);
-
-  // Set up a cookie.
-  {
-    TestDelegate d;
-    URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
-                        &d);
-    req.set_context(context);
-    req.Start();  // Triggers an asynchronous cookie policy check.
-
-    // But, now we cancel the request by letting it go out of scope.  This
-    // should not cause a crash.
-
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
-  }
-
-  context->set_cookie_policy(NULL);
-
-  // Let the cookie policy complete.  Make sure it handles the destruction of
-  // the URLRequest properly.
-  MessageLoop::current()->RunAllPending();
-}
-
-TEST_F(URLRequestTest, CancelTest_During_OnGetCookies) {
-  TestServer test_server(TestServer::TYPE_HTTP, FilePath());
-  ASSERT_TRUE(test_server.Start());
-
-  scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext());
-
-  TestCookiePolicy cookie_policy(TestCookiePolicy::NO_GET_COOKIES);
-  context->set_cookie_policy(&cookie_policy);
-
-  // Set up a cookie.
-  {
-    TestDelegate d;
-    d.set_cancel_in_get_cookies_blocked(true);
-    URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
-                        &d);
-    req.set_context(context);
-    req.Start();  // Triggers an asynchronous cookie policy check.
-
-    MessageLoop::current()->Run();
-
-    EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status());
-
-    EXPECT_EQ(1, d.blocked_get_cookies_count());
-    EXPECT_EQ(0, d.blocked_set_cookie_count());
-  }
-
-  context->set_cookie_policy(NULL);
-}
-
-TEST_F(URLRequestTest, CancelTest_During_OnSetCookie) {
-  TestServer test_server(TestServer::TYPE_HTTP, FilePath());
-  ASSERT_TRUE(test_server.Start());
-
-  scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext());
-
-  TestCookiePolicy cookie_policy(TestCookiePolicy::NO_SET_COOKIE);
-  context->set_cookie_policy(&cookie_policy);
-
-  // Set up a cookie.
-  {
-    TestDelegate d;
-    d.set_cancel_in_set_cookie_blocked(true);
-    URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
-                        &d);
-    req.set_context(context);
-    req.Start();  // Triggers an asynchronous cookie policy check.
-
-    MessageLoop::current()->Run();
-
-    EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status());
-
-    // Even though the response will contain 3 set-cookie headers, we expect
-    // only one to be blocked as that first one will cause OnSetCookie to be
-    // called, which will cancel the request.  Once canceled, it should not
-    // attempt to set further cookies.
-
-    EXPECT_EQ(0, d.blocked_get_cookies_count());
-    EXPECT_EQ(1, d.blocked_set_cookie_count());
-  }
-
-  context->set_cookie_policy(NULL);
-}
-
 TEST_F(URLRequestTest, CookiePolicy_ForceSession) {
   TestServer test_server(TestServer::TYPE_HTTP, FilePath());
   ASSERT_TRUE(test_server.Start());
 
   scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext());
 
   TestCookiePolicy cookie_policy(TestCookiePolicy::FORCE_SESSION);
   context->set_cookie_policy(&cookie_policy);
 
   // Set up a cookie.
@@ skipping 1018 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