Return the full cookie details in TestingAutomationProvider and pass around

chrome/test/automation/automation_json_requests.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/test/automation/automation_json_requests.h"
 
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 209 matching lines @@
   dict.SetInteger("windex", browser_index);
   dict.SetInteger("tab_index", tab_index);
   DictionaryValue reply_dict;
   if (!SendAutomationJSONRequest(sender, dict, &reply_dict))
     return false;
   return reply_dict.GetString("title", tab_title);
 }
 
 bool SendGetCookiesJSONRequest(
     AutomationMessageSender* sender,
+    const std::string& url,
+    ListValue** cookies) {
+  DictionaryValue dict;
+  dict.SetString("command", "GetCookies");
+  dict.SetString("url", url);
+  DictionaryValue reply_dict;
+  if (!SendAutomationJSONRequest(sender, dict, &reply_dict))
+    return false;
+  Value* cookies_unscoped_value;
+  if (!reply_dict.Remove("cookies", &cookies_unscoped_value))
+    return false;
+  scoped_ptr<Value> cookies_value(cookies_unscoped_value);
+  if (!cookies_value->IsType(Value::TYPE_LIST))
+    return false;
+  *cookies = static_cast<ListValue*>(cookies_value.release());
+  return true;
+}
+
+bool SendGetCookiesJSONRequestDeprecated(
+    AutomationMessageSender* sender,
     int browser_index,
     const std::string& url,
     std::string* cookies) {
   DictionaryValue dict;
   dict.SetString("command", "GetCookies");
   dict.SetInteger("windex", browser_index);
   dict.SetString("url", url);
   DictionaryValue reply_dict;
   if (!SendAutomationJSONRequest(sender, dict, &reply_dict))
     return false;
   return reply_dict.GetString("cookies", cookies);
 }
 
 bool SendDeleteCookieJSONRequest(
     AutomationMessageSender* sender,
+    const std::string& url,
+    const std::string& cookie_name) {
+  DictionaryValue dict;
+  dict.SetString("command", "DeleteCookie");
+  dict.SetString("url", url);
+  dict.SetString("name", cookie_name);
+  DictionaryValue reply_dict;
+  return SendAutomationJSONRequest(sender, dict, &reply_dict);
+}
+
+bool SendDeleteCookieJSONRequestDeprecated(
+    AutomationMessageSender* sender,
     int browser_index,
     const std::string& url,
     const std::string& cookie_name) {
   DictionaryValue dict;
   dict.SetString("command", "DeleteCookie");
   dict.SetInteger("windex", browser_index);
   dict.SetString("url", url);
   dict.SetString("name", cookie_name);
   DictionaryValue reply_dict;
   return SendAutomationJSONRequest(sender, dict, &reply_dict);
 }
 
 bool SendSetCookieJSONRequest(
     AutomationMessageSender* sender,
+    const std::string& url,
+    DictionaryValue* cookie_dict) {
+  DictionaryValue dict;
+  dict.SetString("command", "SetCookie");
+  dict.SetString("url", url);
+  dict.Set("cookie", cookie_dict->DeepCopy());
+  DictionaryValue reply_dict;
+  return SendAutomationJSONRequest(sender, dict, &reply_dict);
+}
+
+bool SendSetCookieJSONRequestDeprecated(
+    AutomationMessageSender* sender,
     int browser_index,
     const std::string& url,
     const std::string& cookie) {
   DictionaryValue dict;
   dict.SetString("command", "SetCookie");
   dict.SetInteger("windex", browser_index);
   dict.SetString("url", url);
   dict.SetString("cookie", cookie);
   DictionaryValue reply_dict;
   return SendAutomationJSONRequest(sender, dict, &reply_dict);
@@ skipping 120 matching lines @@
   return SendAutomationJSONRequest(sender, dict, &reply_dict);
 }
 
 bool SendWaitForAllTabsToStopLoadingJSONRequest(
     AutomationMessageSender* sender) {
   DictionaryValue dict;
   dict.SetString("command", "WaitForAllTabsToStopLoading");
   DictionaryValue reply_dict;
   return SendAutomationJSONRequest(sender, dict, &reply_dict);
 }