Finalize a CL originally by departed intern ycxiao@ that detaches the loading of cookies from the...

chrome/browser/net/cookie_policy_browsertest.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 "base/bind.h"
 #include "base/task.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "net/base/cookie_store.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/test/test_server.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
 
 class GetCookiesTask : public Task {
  public:
   GetCookiesTask(const GURL& url,
                  net::URLRequestContextGetter* context_getter,
                  base::WaitableEvent* event,
                  std::string* cookies)
       : url_(url),
         context_getter_(context_getter),
         event_(event),
         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_;
   base::WaitableEvent* const event_;
   std::string* const cookies_;
 
   DISALLOW_COPY_AND_ASSIGN(GetCookiesTask);
 };
@@ skipping 65 matching lines @@
   host_resolver()->AddRule("www.example.com", "127.0.0.1");
 
   ui_test_utils::NavigateToURL(browser(),
                                GURL(url.spec() + redirected_url.spec()));
 
   cookie = GetCookies(redirected_url);
   EXPECT_EQ("cookie2", cookie);
 }
 
 }  // namespace