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

chrome/browser/automation/automation_util.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 "chrome/browser/automation/automation_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 24 matching lines @@
   *cookies = cookie_line;
   event->Signal();
 }
 
 void GetCookiesOnIOThread(
     const GURL& url,
     const scoped_refptr<net::URLRequestContextGetter>& context_getter,
     base::WaitableEvent* event,
     std::string* cookies) {
   context_getter->GetURLRequestContext()->cookie_store()->
-      GetCookiesAsync(url,
+      GetCookiesWithOptionsAsync(url, net::CookieOptions(),
                       base::Bind(&GetCookiesCallback, event, cookies));
 }
 
 void GetCanonicalCookiesCallback(
     base::WaitableEvent* event,
     net::CookieList* cookie_list,
     const net::CookieList& cookies) {
   *cookie_list = cookies;
   event->Signal();
 }
@@ skipping 322 matching lines @@
                                   IPC::Message* message) {
   bool active = AppModalDialogQueue::GetInstance()->HasActiveDialog();
   if (active) {
     AutomationJSONReply(provider, message).SendError(
         "Command cannot be performed because a modal dialog is active");
   }
   return active;
 }
 
 }  // namespace automation_util