Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to renaming of CookiePartition{Keychain -> Collection}

Browse Source 
Chromium change:

https://chromium.googlesource.com/chromium/src/+/244341ec3d29585c9a6b8f627a7bc57d1dd0b712

commit 244341ec3d29585c9a6b8f627a7bc57d1dd0b712
Author: Aykut Bulut <aykutb@google.com>
Date:   Thu Dec 9 15:57:25 2021 +0000

    Rename CookiePartitionKeychain to CookiePartitionKeyCollection.

    Keychain has a certain meaning for iOS and macOS.
    net::CookiePartitionKeychain class stores a collection of keys and the
    term keychain in its name is not related to iOS or macOS keychains.
    Rename net::CookiePartitionKeychain class to
    net::CookiePartitionKeyCollection to prevent a possible confusion.

    Fixed: 1268880
This commit is contained in:
Mario Sanchez Prada
2022-01-24 15:39:00 -05:00
committed by mkarolin
parent a9a1258162
commit d11ebd6b02
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chromium_src/net/cookies/cookie_monster.cc
+3 -3
View File
@@ -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
chromium_src/net/cookies/cookie_monster.h
+1 -1
View File
@@ -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:
chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h
+1 -1
View File
@@ -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
components/ephemeral_storage/url_storage_checker.cc
+1 -1
View File
@@ -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));
}