diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/browser/cookie_store | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/cookie_store')
3 files changed, 5 insertions, 3 deletions
diff --git a/chromium/content/browser/cookie_store/OWNERS b/chromium/content/browser/cookie_store/OWNERS index b23c10fd54c..34ad42db924 100644 --- a/chromium/content/browser/cookie_store/OWNERS +++ b/chromium/content/browser/cookie_store/OWNERS @@ -1,7 +1,8 @@ # Primary -pwnall@chromium.org +ayui@chromium.org # Secondary +pwnall@chromium.org jsbell@chromium.org # TEAM: storage-dev@chromium.org diff --git a/chromium/content/browser/cookie_store/cookie_change_subscription.cc b/chromium/content/browser/cookie_store/cookie_change_subscription.cc index 5367928aa08..6dff0ba3213 100644 --- a/chromium/content/browser/cookie_store/cookie_change_subscription.cc +++ b/chromium/content/browser/cookie_store/cookie_change_subscription.cc @@ -169,7 +169,7 @@ bool CookieChangeSubscription::ShouldObserveChangeTo( net::CookieOptions::SameSiteCookieContext::MakeInclusive()); return cookie.IncludeForRequestURL(url_, net_options, access_semantics) - .IsInclude(); + .status.IsInclude(); } bool operator==(const CookieChangeSubscription& lhs, diff --git a/chromium/content/browser/cookie_store/cookie_store_manager_unittest.cc b/chromium/content/browser/cookie_store/cookie_store_manager_unittest.cc index 8906f10e0be..2b96481bfe1 100644 --- a/chromium/content/browser/cookie_store/cookie_store_manager_unittest.cc +++ b/chromium/content/browser/cookie_store/cookie_store_manager_unittest.cc @@ -22,6 +22,7 @@ #include "mojo/public/cpp/test_support/test_utils.h" #include "net/base/features.h" #include "net/cookies/cookie_constants.h" +#include "net/cookies/cookie_inclusion_status.h" #include "net/cookies/cookie_util.h" #include "services/network/public/cpp/features.h" #include "testing/gtest/include/gtest/gtest.h" @@ -287,7 +288,7 @@ class CookieStoreManagerTest cookie, net::cookie_util::SimulatedCookieSource(cookie, "https"), net::CookieOptions::MakeAllInclusive(), base::BindLambdaForTesting( - [&](net::CanonicalCookie::CookieInclusionStatus service_status) { + [&](net::CookieInclusionStatus service_status) { success = service_status.IsInclude(); run_loop.Quit(); })); |