| Index: net/cookies/cookie_monster.cc
|
| diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
|
| index c73e74aee7d2f4ae38e61053239b475930601e39..1842838a6c122c2364c716f33aa49aa5fb4ab335 100644
|
| --- a/net/cookies/cookie_monster.cc
|
| +++ b/net/cookies/cookie_monster.cc
|
| @@ -406,7 +406,7 @@ class CookieMonster::SetCookieWithDetailsTask : public CookieMonsterTask {
|
| base::Time last_access_time,
|
| bool secure,
|
| bool http_only,
|
| - bool same_site,
|
| + CookieSameSite same_site,
|
| bool enforce_strict_secure,
|
| CookiePriority priority,
|
| const SetCookiesCallback& callback)
|
| @@ -443,7 +443,7 @@ class CookieMonster::SetCookieWithDetailsTask : public CookieMonsterTask {
|
| base::Time last_access_time_;
|
| bool secure_;
|
| bool http_only_;
|
| - bool same_site_;
|
| + CookieSameSite same_site_;
|
| bool enforce_strict_secure_;
|
| CookiePriority priority_;
|
| SetCookiesCallback callback_;
|
| @@ -850,7 +850,7 @@ void CookieMonster::SetCookieWithDetailsAsync(
|
| Time last_access_time,
|
| bool secure,
|
| bool http_only,
|
| - bool same_site,
|
| + CookieSameSite same_site,
|
| bool enforce_strict_secure,
|
| CookiePriority priority,
|
| const SetCookiesCallback& callback) {
|
| @@ -1040,7 +1040,7 @@ bool CookieMonster::SetCookieWithDetails(const GURL& url,
|
| base::Time last_access_time,
|
| bool secure,
|
| bool http_only,
|
| - bool same_site,
|
| + CookieSameSite same_site,
|
| bool enforce_strict_secure,
|
| CookiePriority priority) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| @@ -1703,7 +1703,8 @@ CookieMonster::CookieMap::iterator CookieMonster::InternalInsertCookie(
|
| }
|
|
|
| // See InitializeHistograms() for details.
|
| - int32_t type_sample = cc->IsSameSite() ? 1 << COOKIE_TYPE_SAME_SITE : 0;
|
| + int32_t type_sample =
|
| + cc->SameSite() != COOKIE_SAME_SITE_NONE ? 1 << COOKIE_TYPE_SAME_SITE : 0;
|
| type_sample |= cc->IsHttpOnly() ? 1 << COOKIE_TYPE_HTTPONLY : 0;
|
| type_sample |= cc->IsSecure() ? 1 << COOKIE_TYPE_SECURE : 0;
|
| histogram_cookie_type_->Add(type_sample);
|
|
|