summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation/automation_util.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 15:22:15 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 15:22:15 +0000
commit10b691f4261e09a0c824ecec44f37ac74fc4dcec (patch)
tree4f00f2cb6a58eb23c04b1f231367d4810229d835 /chrome/browser/automation/automation_util.cc
parent7afca868e97f8228878fc6d3db9194c5596ecf22 (diff)
downloadchromium_src-10b691f4261e09a0c824ecec44f37ac74fc4dcec.zip
chromium_src-10b691f4261e09a0c824ecec44f37ac74fc4dcec.tar.gz
chromium_src-10b691f4261e09a0c824ecec44f37ac74fc4dcec.tar.bz2
Remove the force_session cookie option, as it's not used anymore
BUG=133903 TEST=none TBR=sky@chromium.org,wtc@chromium.org Review URL: https://chromiumcodereview.appspot.com/10694093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_util.cc')
-rw-r--r--chrome/browser/automation/automation_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc
index 86bfaec..12057f5 100644
--- a/chrome/browser/automation/automation_util.cc
+++ b/chrome/browser/automation/automation_util.cc
@@ -263,7 +263,7 @@ void GetCookiesJSON(AutomationProvider* provider,
cookie_dict->SetString("domain", cookie.Domain());
cookie_dict->SetBoolean("secure", cookie.IsSecure());
cookie_dict->SetBoolean("http_only", cookie.IsHttpOnly());
- if (cookie.DoesExpire())
+ if (cookie.IsPersistent())
cookie_dict->SetDouble("expiry", cookie.ExpiryDate().ToDoubleT());
list->Append(cookie_dict);
}
@@ -368,7 +368,7 @@ void SetCookieJSON(AutomationProvider* provider,
net::CookieMonster::CanonicalCookie::Create(
GURL(url), name, value, domain, path,
mac_key, mac_algorithm, base::Time(),
- base::Time::FromDoubleT(expiry), secure, http_only, expiry != 0));
+ base::Time::FromDoubleT(expiry), secure, http_only));
if (!cookie.get()) {
reply.SendError("given 'cookie' parameters are invalid");
return;