Index: net/cookies/canonical_cookie.cc |
diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc |
index 0a5e794fe81cdbea370de2ad45c467d900707fbe..322c21bfebe778166fbf4f40364d54f2807aecfe 100644 |
--- a/net/cookies/canonical_cookie.cc |
+++ b/net/cookies/canonical_cookie.cc |
@@ -134,7 +134,7 @@ CanonicalCookie::CanonicalCookie(const GURL& url, |
const base::Time& last_access, |
bool secure, |
bool httponly, |
- bool same_site, |
+ CookieSameSite same_site, |
CookiePriority priority) |
: source_(url.SchemeIsFile() ? url : url.GetOrigin()), |
name_(name), |
@@ -158,7 +158,7 @@ CanonicalCookie::CanonicalCookie(const GURL& url, const ParsedCookie& pc) |
last_access_date_(Time()), |
secure_(pc.IsSecure()), |
httponly_(pc.IsHttpOnly()), |
- same_site_(pc.IsSameSite()), |
+ same_site_(pc.SameSite()), |
priority_(pc.Priority()) { |
if (pc.HasExpires()) |
expiry_date_ = CanonExpiration(pc, creation_date_, creation_date_); |
@@ -277,7 +277,7 @@ scoped_ptr<CanonicalCookie> CanonicalCookie::Create( |
url, parsed_cookie.Name(), parsed_cookie.Value(), cookie_domain, |
cookie_path, creation_time, cookie_expires, creation_time, |
parsed_cookie.IsSecure(), parsed_cookie.IsHttpOnly(), |
- parsed_cookie.IsSameSite(), parsed_cookie.Priority())); |
+ parsed_cookie.SameSite(), parsed_cookie.Priority())); |
} |
// static |
@@ -291,7 +291,7 @@ scoped_ptr<CanonicalCookie> CanonicalCookie::Create( |
const base::Time& expiration, |
bool secure, |
bool http_only, |
- bool same_site, |
+ CookieSameSite same_site, |
bool enforce_strict_secure, |
CookiePriority priority) { |
// Expect valid attribute tokens and values, as defined by the ParsedCookie |
@@ -422,7 +422,7 @@ bool CanonicalCookie::IncludeForRequestURL(const GURL& url, |
if (!IsOnPath(url.path())) |
return false; |
// Don't include same-site cookies for cross-site requests. |
- if (IsSameSite() && !options.include_same_site()) |
+ if (SameSite() && !options.include_same_site()) |
mmenke
2016/03/11 18:08:30
Should check the value of SameSite here explicitly
Mike West
2016/03/14 10:18:53
Yup. Adding a TODO as well to point to the fact th
|
return false; |
return true; |