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

chrome/browser/net/cookie_policy_browsertest.cc

Index: chrome/browser/net/cookie_policy_browsertest.cc
===================================================================
--- chrome/browser/net/cookie_policy_browsertest.cc	(revision 100345)
+++ chrome/browser/net/cookie_policy_browsertest.cc	(working copy)
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
 #include "base/task.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ -29,12 +30,21 @@
         cookies_(cookies) {}
 
   virtual void Run() {
-    *cookies_ =
-        context_getter_->GetURLRequestContext()->cookie_store()->
-        GetCookies(url_);
-    event_->Signal();
+    net::CookieOptions options;
+    context_getter_->GetURLRequestContext()->cookie_store()
+        ->GetCookiesWithOptionsAsync(
+            url_, options, base::Bind(&GetCookiesTask::GetCookiesCallback,
+                                      base::Unretained(cookies_),
+                                      base::Unretained(event_)));
   }
 
+  static void GetCookiesCallback(std::string* cookies_out,
+                                 base::WaitableEvent* event,
+                                 const std::string& cookies) {
+    *cookies_out = cookies;
+    event->Signal();
+  }
+
  private:
   const GURL& url_;
   net::URLRequestContextGetter* const context_getter_;