diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 04:50:10 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 04:50:10 +0000 |
| commit | dedec0b98955617acca49f50627a6d18d1f7958e (patch) | |
| tree | 159fa18bbe7e89598ce3d07025a43802c17e7050 /chrome/browser/automation | |
| parent | d2a2ca70268d37cc4958ece3ef02c7345a7dd54d (diff) | |
| download | chromium_src-dedec0b98955617acca49f50627a6d18d1f7958e.zip chromium_src-dedec0b98955617acca49f50627a6d18d1f7958e.tar.gz chromium_src-dedec0b98955617acca49f50627a6d18d1f7958e.tar.bz2 | |
Remove the last traces of experimental support for MAC cookies
Support for MAC cookies was mostly removed in r126928.
However, changes to the cookie store were not fully
reverted, and new callsites were introduced due to the
interface changes. This fully removes the interfaces
introduced for MAC cookies, including the
CookieMonster::CookieInfo class.
BUG=none
TBR=willchan
Review URL: https://chromiumcodereview.appspot.com/12326056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/automation_util.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 97978f21..1013bf7 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -379,8 +379,6 @@ void SetCookieJSON(AutomationProvider* provider, std::string name, value; std::string domain; std::string path = "/"; - std::string mac_key; - std::string mac_algorithm; bool secure = false; double expiry = 0; bool http_only = false; @@ -402,11 +400,6 @@ void SetCookieJSON(AutomationProvider* provider, reply.SendError("optional 'path' invalid"); return; } - // mac_key and mac_algorithm are optional. - if (cookie_dict->HasKey("mac_key")) - cookie_dict->GetString("mac_key", &mac_key); - if (cookie_dict->HasKey("mac_algorithm")) - cookie_dict->GetString("mac_algorithm", &mac_algorithm); if (cookie_dict->HasKey("secure") && !cookie_dict->GetBoolean("secure", &secure)) { reply.SendError("optional 'secure' invalid"); @@ -426,8 +419,7 @@ void SetCookieJSON(AutomationProvider* provider, scoped_ptr<net::CanonicalCookie> cookie( net::CanonicalCookie::Create( - GURL(url), name, value, domain, path, - mac_key, mac_algorithm, base::Time(), + GURL(url), name, value, domain, path, base::Time(), base::Time::FromDoubleT(expiry), secure, http_only)); if (!cookie.get()) { reply.SendError("given 'cookie' parameters are invalid"); |