Return the full cookie details in TestingAutomationProvider and pass around

chrome/test/webdriver/automation.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_WEBDRIVER_AUTOMATION_H_
 #define CHROME_TEST_WEBDRIVER_AUTOMATION_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/task.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/automation_constants.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 class AutomationProxy;
 class DictionaryValue;
 class FilePath;
 class GURL;
+class ListValue;
 class ProxyLauncher;
 struct WebKeyEvent;
 
 namespace gfx {
 class Point;
 }
 
 namespace webdriver {
 
 class FramePath;
@@ skipping 27 matching lines @@
   // been processed by the web page.
   void SendWebKeyEvent(int tab_id, const WebKeyEvent& key_event, bool* success);
 
   void NavigateToURL(int tab_id, const std::string& url, bool* success);
   void GoForward(int tab_id, bool* success);
   void GoBack(int tab_id, bool* success);
   void Reload(int tab_id, bool* success);
   void GetURL(int tab_id, std::string* url, bool* success);
   void GetGURL(int tab_id, GURL* gurl, bool* success);
   void GetTabTitle(int tab_id, std::string* tab_title, bool* success);
-  void GetCookies(
+
+  void GetCookies(const std::string& url, ListValue** cookies, bool* success);
+  void GetCookiesDeprecated(
       int tab_id, const GURL& gurl, std::string* cookies, bool* success);
-  void DeleteCookie(int tab_id,
-                    const GURL& gurl,
+  void DeleteCookie(const std::string& url,
                     const std::string& cookie_name,
                     bool* success);
+  void DeleteCookieDeprecated(int tab_id,
+                              const GURL& gurl,
+                              const std::string& cookie_name,
+                              bool* success);
   void SetCookie(
+      const std::string& url, DictionaryValue* cookie_dict, bool* success);
+  void SetCookieDeprecated(
       int tab_id, const GURL& gurl, const std::string& cookie, bool* success);
+
   void MouseMove(int tab_id, const gfx::Point& p, bool* success);
   void MouseClick(int tab_id,
                   const gfx::Point& p,
                   automation::MouseButton button,
                   bool* success);
   void MouseDrag(int tab_id,
                  const gfx::Point& start,
                  const gfx::Point& end,
                  bool* success);
 
   // Get persistent IDs for all the tabs currently open. These IDs can be used
   // to identify the tab as long as the tab exists.
   void GetTabIds(std::vector<int>* tab_ids, bool* success);
 
   // Check if the given tab exists currently.
   void DoesTabExist(int tab_id, bool* does_exist, bool* success);
 
   void CloseTab(int tab_id, bool* success);
 
   // Gets the version of the runing browser.
-  void GetVersion(std::string* version);
+  void GetBrowserVersion(std::string* version);
 
   // Waits for all tabs to stop loading.
   void WaitForAllTabsToStopLoading(bool* success);
 
  private:
   AutomationProxy* automation() const;
   bool GetIndicesForTab(int tab_id, int* browser_index, int* tab_index);
 
   scoped_ptr<ProxyLauncher> launcher_;
 
   DISALLOW_COPY_AND_ASSIGN(Automation);
 };
 
 }  // namespace webdriver
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation);
 
 #endif  // CHROME_TEST_WEBDRIVER_AUTOMATION_H_