| Index: chrome/browser/automation/testing_automation_provider.h
 | 
| diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
 | 
| index 762f9c08e43861ac515d07f74afe9247732739d8..d516f418f6f26365a4bc4ac6569d0b7ae69da21e 100644
 | 
| --- a/chrome/browser/automation/testing_automation_provider.h
 | 
| +++ b/chrome/browser/automation/testing_automation_provider.h
 | 
| @@ -863,16 +863,27 @@ class TestingAutomationProvider : public AutomationProvider,
 | 
|    void GetTabTitleJSON(DictionaryValue* args, IPC::Message* reply_message);
 | 
|  
 | 
|    // Gets the cookies for the given URL. Uses the JSON interface.
 | 
| +  // "expiry" refers to the amount of seconds since the Unix epoch. If omitted,
 | 
| +  // the cookie is valid for the duration of the browser session.
 | 
|    // Example:
 | 
| -  //   input: { "windex": 1, "tab_index": 1, "url": "http://www.google.com" }
 | 
| -  //   output: { "cookies": "PREF=12012" }
 | 
| +  //   input: { "url": "http://www.google.com" }
 | 
| +  //   output: { "cookies": [
 | 
| +  //               {
 | 
| +  //                 "name": "PREF",
 | 
| +  //                 "value": "123101",
 | 
| +  //                 "path": "/",
 | 
| +  //                 "domain": "www.google.com",
 | 
| +  //                 "secure": false,
 | 
| +  //                 "expiry": 1401982012
 | 
| +  //               }
 | 
| +  //             ]
 | 
| +  //           }
 | 
|    void GetCookiesJSON(DictionaryValue* args, IPC::Message* reply_message);
 | 
|  
 | 
|    // Deletes the cookie with the given name for the URL. Uses the JSON
 | 
|    // interface.
 | 
|    // Example:
 | 
| -  //   input: { "windex": 1,
 | 
| -  //            "tab_index": 1,
 | 
| +  //   input: {
 | 
|    //            "url": "http://www.google.com",
 | 
|    //            "name": "my_cookie"
 | 
|    //          }
 | 
| @@ -880,11 +891,25 @@ class TestingAutomationProvider : public AutomationProvider,
 | 
|    void DeleteCookieJSON(DictionaryValue* args, IPC::Message* reply_message);
 | 
|  
 | 
|    // Sets a cookie for the given URL. Uses the JSON interface.
 | 
| +  // "expiry" refers to the amount of seconds since the Unix epoch. If omitted,
 | 
| +  // the cookie will be valid for the duration of the browser session.
 | 
| +  // "domain" refers to the applicable domain for the cookie. Valid domain
 | 
| +  // choices for the site "http://www.google.com" and resulting cookie
 | 
| +  // applicability:
 | 
| +  //   [.]www.google.com - applicable on www.google.com and its subdomains
 | 
| +  //   [.]google.com - applicable on google.com and its subdomains
 | 
| +  //   <none> - applicable only on www.google.com
 | 
| +  //
 | 
|    // Example:
 | 
| -  //   input: { "windex": 1,
 | 
| -  //            "tab_index": 1,
 | 
| -  //            "url": "http://www.google.com",
 | 
| -  //            "cookie": "PREF=21321"
 | 
| +  //   input: { "url": "http://www.google.com",
 | 
| +  //            "cookie": {
 | 
| +  //              "name": "PREF",
 | 
| +  //              "value": "123101",
 | 
| +  //              "path": "/",                  // optional
 | 
| +  //              "domain": ".www.google.com",  // optional
 | 
| +  //              "secure": false,              // optional
 | 
| +  //              "expiry": 1401982012          // optional
 | 
| +  //            }
 | 
|    //          }
 | 
|    //   output: none
 | 
|    void SetCookieJSON(DictionaryValue* args, IPC::Message* reply_message);
 | 
| 
 |