diff --git a/chromium_src/net/cookies/cookie_monster.cc b/chromium_src/net/cookies/cookie_monster.cc index 8a991c2b8ff..19dea0db496 100644 --- a/chromium_src/net/cookies/cookie_monster.cc +++ b/chromium_src/net/cookies/cookie_monster.cc @@ -124,7 +124,7 @@ void CookieMonster::SetCanonicalCookieAsync( void CookieMonster::GetCookieListWithOptionsAsync( const GURL& url, const CookieOptions& options, - const CookiePartitionKeychain& cookie_partition_keychain, + const CookiePartitionKeyCollection& cookie_partition_key_collection, GetCookieListCallback callback) { if (options.should_use_ephemeral_storage()) { if (!options.top_frame_origin()) { @@ -138,12 +138,12 @@ void CookieMonster::GetCookieListWithOptionsAsync( GetOrCreateEphemeralCookieStoreForTopFrameURL( options.top_frame_origin()->GetURL()); ephemeral_monster->GetCookieListWithOptionsAsync( - url, options, cookie_partition_keychain, std::move(callback)); + url, options, cookie_partition_key_collection, std::move(callback)); return; } ChromiumCookieMonster::GetCookieListWithOptionsAsync( - url, options, cookie_partition_keychain, std::move(callback)); + url, options, cookie_partition_key_collection, std::move(callback)); } } // namespace net diff --git a/chromium_src/net/cookies/cookie_monster.h b/chromium_src/net/cookies/cookie_monster.h index 8e951eab734..8afcdd3ba00 100644 --- a/chromium_src/net/cookies/cookie_monster.h +++ b/chromium_src/net/cookies/cookie_monster.h @@ -44,7 +44,7 @@ class NET_EXPORT CookieMonster : public ChromiumCookieMonster { void GetCookieListWithOptionsAsync( const GURL& url, const CookieOptions& options, - const CookiePartitionKeychain& cookie_partition_keychain, + const CookiePartitionKeyCollection& cookie_partition_key_collection, GetCookieListCallback callback) override; private: diff --git a/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h b/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h index af9f873c9ca..3c5243b1160 100644 --- a/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h +++ b/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h @@ -10,7 +10,7 @@ #include "net/cookies/cookie_access_result.h" #include "net/cookies/cookie_change_dispatcher.h" #include "net/cookies/cookie_options.h" -#include "net/cookies/cookie_partition_keychain.h" +#include "net/cookies/cookie_partition_key_collection.h" #include "services/network/public/mojom/cookie_manager.mojom.h" #define CookieOptions CookieOptions_ChromiumImpl diff --git a/components/ephemeral_storage/url_storage_checker.cc b/components/ephemeral_storage/url_storage_checker.cc index ad429363d84..c2d7424783d 100644 --- a/components/ephemeral_storage/url_storage_checker.cc +++ b/components/ephemeral_storage/url_storage_checker.cc @@ -33,7 +33,7 @@ UrlStorageChecker::~UrlStorageChecker() = default; void UrlStorageChecker::StartCheck() { storage_partition_->GetCookieManagerForBrowserProcess()->GetCookieList( url_, net::CookieOptions::MakeAllInclusive(), - net::CookiePartitionKeychain::ContainsAll(), + net::CookiePartitionKeyCollection::ContainsAll(), base::BindOnce(&UrlStorageChecker::OnGetCookieList, this)); }