Rewrite the cookies pyauto test as browser tests.

content/browser/renderer_host/resource_dispatcher_host_browsertest.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 "base/string_util.h"
-#include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/test_url_constants.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "content/test/net/url_request_failed_job.h"
 #include "content/test/net/url_request_mock_http_job.h"
 #include "net/base/net_errors.h"
-#include "net/cookies/cookie_store.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 content {
 
-namespace {
-
-void GetCookiesCallback(std::string* cookies_out,
-                        base::WaitableEvent* event,
-                        const std::string& cookies) {
-  *cookies_out = cookies;
-  event->Signal();
-}
-
-void GetCookiesOnIOThread(const GURL& url,
-                          net::URLRequestContextGetter* context_getter,
-                          base::WaitableEvent* event,
-                          std::string* cookies) {
-  net::CookieStore* cookie_store =
-      context_getter->GetURLRequestContext()->cookie_store();
-  cookie_store->GetCookiesWithOptionsAsync(
-      url, net::CookieOptions(),
-      base::Bind(&GetCookiesCallback,
-                 base::Unretained(cookies), base::Unretained(event)));
-}
-
-}  // namespace
-
 class ResourceDispatcherHostBrowserTest : public ContentBrowserTest,
                                           public DownloadManager::Observer {
  public:
   ResourceDispatcherHostBrowserTest() : got_downloads_(false) {}
 
  protected:
   virtual void SetUpOnMainThread() OVERRIDE {
     FilePath path = GetTestFilePath("", "");
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
@@ skipping 32 matching lines @@
     // Create dynamic popup.
     if (!ExecuteJavaScript(render_view_host(), L"", L"OpenPopup();"))
       return false;
 
     Shell* new_shell = new_shell_observer.GetShell();
     *title = new_shell->web_contents()->GetTitle();
     return true;
   }
 
   std::string GetCookies(const GURL& url) {
-    std::string cookies;
-    base::WaitableEvent event(true, false);
-    net::URLRequestContextGetter* context_getter =
-        shell()->web_contents()->GetBrowserContext()->GetRequestContext();
-
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&GetCookiesOnIOThread, url,
-                   make_scoped_refptr(context_getter), &event, &cookies));
-    event.Wait();
-    return cookies;
+    return content::GetCookies(
+        shell()->web_contents()->GetBrowserContext(), url);
   }
 
   bool got_downloads() const { return got_downloads_; }
 
  private:
   bool got_downloads_;
 };
 
 // Test title for content created by javascript window.open().
 // See http://crbug.com/5988
@@ skipping 303 matching lines @@
                        CrossSiteFailedRequest) {
   // Visit another URL first to trigger a cross-site navigation.
   NavigateToURL(shell(), GetTestUrl("", "simple_page.html"));
 
   // Visit a URL that fails without calling ResourceDispatcherHost::Read.
   GURL broken_url("chrome://theme");
   NavigateToURL(shell(), broken_url);
 }
 
 }  // namespace content