Re-land http://codereview.chromium.org/7831056/ and http://codereview.chromium.org/7833042/ .

net/url_request/url_request_unittest.cc

Index: net/url_request/url_request_unittest.cc
===================================================================
--- net/url_request/url_request_unittest.cc	(revision 100345)
+++ net/url_request/url_request_unittest.cc	(working copy)
@@ -13,6 +13,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
@@ -2017,6 +2018,13 @@
   }
 }
 
+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, new MessageLoop::QuitTask());
+}
+
 TEST_F(URLRequestTest, CookiePolicy_ForceSession) {
   TestServer test_server(TestServer::TYPE_HTTP, FilePath());
   ASSERT_TRUE(test_server.Start());
@@ -2037,10 +2045,11 @@
   }
 
   // Now, check the cookie store.
-  CookieList cookies =
-      default_context_->cookie_store()->GetCookieMonster()->GetAllCookies();
-  EXPECT_EQ(1U, cookies.size());
-  EXPECT_FALSE(cookies[0].IsPersistent());
+  bool was_run = false;
+  default_context_->cookie_store()->GetCookieMonster()->GetAllCookiesAsync(
+      base::Bind(&CheckCookiePolicyCallback, &was_run));
+  MessageLoop::current()->RunAllPending();
+  DCHECK(was_run);
 }
 
 // In this test, we do a POST which the server will 302 redirect.