Update to Chromium version 96.0.4664.0 (#929512)

This commit is contained in:
Marshall Greenblatt
2021-10-18 18:17:16 -04:00
parent 4dd314dec3
commit 6872dadd74
103 changed files with 897 additions and 675 deletions

View File

@ -81,15 +81,17 @@ void GetCookieListCallback(const AllowCookieCallback& allow_cookie_callback,
std::move(done_callback), included_cookies));
}
void LoadCookiesOnUIThread(content::BrowserContext* browser_context,
const GURL& url,
const net::CookieOptions& options,
const AllowCookieCallback& allow_cookie_callback,
DoneCookieCallback done_callback) {
void LoadCookiesOnUIThread(
content::BrowserContext* browser_context,
const GURL& url,
const net::CookieOptions& options,
const net::CookiePartitionKeychain& cookie_partition_keychain,
const AllowCookieCallback& allow_cookie_callback,
DoneCookieCallback done_callback) {
CEF_REQUIRE_UIT();
GetCookieManager(browser_context)
->GetCookieList(
url, options,
url, options, cookie_partition_keychain,
base::BindOnce(GetCookieListCallback, allow_cookie_callback,
std::move(done_callback)));
}
@ -199,9 +201,10 @@ void LoadCookies(content::BrowserContext* browser_context,
}
CEF_POST_TASK(
CEF_UIT, base::BindOnce(LoadCookiesOnUIThread, browser_context,
request.url, GetCookieOptions(request),
allow_cookie_callback, std::move(done_callback)));
CEF_UIT,
base::BindOnce(LoadCookiesOnUIThread, browser_context, request.url,
GetCookieOptions(request), net::CookiePartitionKeychain(),
allow_cookie_callback, std::move(done_callback)));
}
void SaveCookies(content::BrowserContext* browser_context,