Return the full cookie details in TestingAutomationProvider and pass around

chrome/test/automation/automation_json_requests.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_JSON_REQUESTS_H_
 #define CHROME_TEST_AUTOMATION_AUTOMATION_JSON_REQUESTS_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/common/automation_constants.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 class AutomationMessageSender;
 class GURL;
+class DictionaryValue;
+class ListValue;
 class Value;
 
 struct WebKeyEvent {
   WebKeyEvent(automation::KeyEventTypes type,
               ui::KeyboardCode key_code,
               const std::string& unmodified_text,
               const std::string& modified_text,
               int modifiers);
 
   automation::KeyEventTypes type;
@@ skipping 77 matching lines @@
     int tab_index,
     std::string* url) WARN_UNUSED_RESULT;
 
 // Requests the title of the specified tab. Returns true on success.
 bool SendGetTabTitleJSONRequest(
     AutomationMessageSender* sender,
     int browser_index,
     int tab_index,
     std::string* tab_title) WARN_UNUSED_RESULT;
 
+// Requests all the cookies for the given URL. On success returns true and
+// caller takes ownership of |cookies|, which is a list of all the cookies in
+// dictionary format.
+bool SendGetCookiesJSONRequest(
+    AutomationMessageSender* sender,
+    const std::string& url,
+    ListValue** cookies) WARN_UNUSED_RESULT;
+
 // Requests all the cookies for the given URL. Returns true on success.
-bool SendGetCookiesJSONRequest(
+// Use |SendGetCookiesJSONRequest| for chrome versions greater than 11.
+// TODO(kkania): Remove this function when version 12 is stable.
+bool SendGetCookiesJSONRequestDeprecated(
     AutomationMessageSender* sender,
     int browser_index,
     const std::string& url,
     std::string* cookies) WARN_UNUSED_RESULT;
 
 // Requests deletion of the cookie with the given name and URL. Returns true
 // on success.
 bool SendDeleteCookieJSONRequest(
     AutomationMessageSender* sender,
+    const std::string& url,
+    const std::string& cookie_name) WARN_UNUSED_RESULT;
+
+// Requests deletion of the cookie with the given name and URL. Returns true
+// on success. Use |SendDeleteCookieJSONRequest| for chrome versions greater
+// than 11.
+// TODO(kkania): Remove this function when version 12 is stable.
+bool SendDeleteCookieJSONRequestDeprecated(
+    AutomationMessageSender* sender,
     int browser_index,
     const std::string& url,
     const std::string& cookie_name) WARN_UNUSED_RESULT;
 
 // Requests setting the given cookie for the given URL. Returns true on
-// success.
+// success. The caller retains ownership of |cookie_dict|.
 bool SendSetCookieJSONRequest(
     AutomationMessageSender* sender,
+    const std::string& url,
+    DictionaryValue* cookie_dict) WARN_UNUSED_RESULT;
+
+// Requests setting the given cookie for the given URL. Returns true on
+// success. Use |SendSetCookieJSONRequest| instead for chrome versions greater
+// than 11.
+// TODO(kkania): Remove this when version 12 is stable.
+bool SendSetCookieJSONRequestDeprecated(
+    AutomationMessageSender* sender,
     int browser_index,
     const std::string& url,
     const std::string& cookie) WARN_UNUSED_RESULT;
 
 // Requests the IDs for all open tabs. Returns true on success.
 bool SendGetTabIdsJSONRequest(
     AutomationMessageSender* sender,
     std::vector<int>* tab_ids) WARN_UNUSED_RESULT;
 
 // Requests whether the given tab ID is valid. Returns true on success.
@@ skipping 44 matching lines @@
     AutomationMessageSender* sender,
     int browser_index,
     int tab_index,
     const WebKeyEvent& key_event) WARN_UNUSED_RESULT;
 
 // Requests to wait for all tabs to stop loading. Returns true on success.
 bool SendWaitForAllTabsToStopLoadingJSONRequest(
     AutomationMessageSender* sender) WARN_UNUSED_RESULT;
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_JSON_REQUESTS_H_