Commit 38d96553 authored by Steven Bingler's avatar Steven Bingler Committed by Commit Bot

Use MakeAllInclusive() in storage partition cookie unittests

Modify storage partition cookie helper functions to use
MakeAllInclusive() instead of the CookieOptions() in order to prevent
test breakage when cookies become SameSite-by-Default.

MakeAllInclusive() has a SameSite context of STRICT instead
of CookieOptions()'s CROSS_SITE.

Bug: 1016512
Change-Id: Id826eeaf0bea5c0bd60dc6380f57fd419d62388d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879561Reviewed-by: default avatarAlex Moshchuk <alexmos@chromium.org>
Commit-Queue: Steven Bingler <bingler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709227}
parent da77fd43
...@@ -144,7 +144,7 @@ class RemoveCookieTester { ...@@ -144,7 +144,7 @@ class RemoveCookieTester {
bool ContainsCookie() { bool ContainsCookie() {
get_cookie_success_ = false; get_cookie_success_ = false;
storage_partition_->GetCookieManagerForBrowserProcess()->GetCookieList( storage_partition_->GetCookieManagerForBrowserProcess()->GetCookieList(
kOrigin1.GetURL(), net::CookieOptions(), kOrigin1.GetURL(), net::CookieOptions::MakeAllInclusive(),
base::BindOnce(&RemoveCookieTester::GetCookieListCallback, base::BindOnce(&RemoveCookieTester::GetCookieListCallback,
base::Unretained(this))); base::Unretained(this)));
await_completion_.BlockUntilNotified(); await_completion_.BlockUntilNotified();
...@@ -157,7 +157,7 @@ class RemoveCookieTester { ...@@ -157,7 +157,7 @@ class RemoveCookieTester {
kOrigin1.GetURL(), "A=1", base::Time::Now(), kOrigin1.GetURL(), "A=1", base::Time::Now(),
base::nullopt /* server_time */, &status)); base::nullopt /* server_time */, &status));
storage_partition_->GetCookieManagerForBrowserProcess()->SetCanonicalCookie( storage_partition_->GetCookieManagerForBrowserProcess()->SetCanonicalCookie(
*cc, kOrigin1.scheme(), net::CookieOptions(), *cc, kOrigin1.scheme(), net::CookieOptions::MakeAllInclusive(),
base::BindOnce(&RemoveCookieTester::SetCookieCallback, base::BindOnce(&RemoveCookieTester::SetCookieCallback,
base::Unretained(this))); base::Unretained(this)));
await_completion_.BlockUntilNotified(); await_completion_.BlockUntilNotified();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment