Update to Chromium version 100.0.4896.0 (#972766)

This commit is contained in:
Marshall Greenblatt
2022-02-21 17:23:40 -05:00
parent a2c621bf8b
commit f97f0bbda6
120 changed files with 668 additions and 725 deletions

View File

@ -10,24 +10,24 @@ index 96d1a51ec1078..e8120a818b1f2 100644
+// This load will not send any cookies. For CEF usage.
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
index affbbf4c11723..e003f694aa5ac 100644
index 3faca2e98f4ac..c6729030a53cc 100644
--- net/url_request/url_request_http_job.cc
+++ net/url_request/url_request_http_job.cc
@@ -591,7 +591,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
@@ -1750,7 +1750,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
// Read cookies whenever allow_credentials() is true, even if the PrivacyMode
// is being overridden by NetworkDelegate and will eventually block them, as
// blocked cookies still need to be logged in that case.
- if (cookie_store && request_->allow_credentials()) {
+ if (cookie_store && request_->allow_credentials() &&
+ !(request_info_.load_flags & LOAD_DO_NOT_SEND_COOKIES)) {
bool force_ignore_site_for_cookies =
request_->force_ignore_site_for_cookies();
if (cookie_store->cookie_access_delegate() &&
- return request_->context()->cookie_store() && request_->allow_credentials();
+ return request_->context()->cookie_store() && request_->allow_credentials() &&
+ !(request_info_.load_flags & LOAD_DO_NOT_SEND_COOKIES);
}
bool URLRequestHttpJob::IsPartitionedCookiesEnabled() const {
diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
index f14c99863eb3f..51679008ead55 100644
index 87868727a7822..a30035aeb00cc 100644
--- services/network/public/cpp/resource_request.cc
+++ services/network/public/cpp/resource_request.cc
@@ -265,7 +265,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
@@ -264,7 +264,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
}
bool ResourceRequest::SendsCookies() const {