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/net/url_request/url_request.cc | |
| 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/net/url_request/url_request.cc')
| -rw-r--r-- | chromium/net/url_request/url_request.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chromium/net/url_request/url_request.cc b/chromium/net/url_request/url_request.cc index 40927b586fa..cbed158f16b 100644 --- a/chromium/net/url_request/url_request.cc +++ b/chromium/net/url_request/url_request.cc @@ -395,7 +395,7 @@ int URLRequest::GetResponseCode() const { return job_->GetResponseCode(); } -void URLRequest::set_maybe_sent_cookies(CookieStatusList cookies) { +void URLRequest::set_maybe_sent_cookies(CookieAccessResultList cookies) { maybe_sent_cookies_ = std::move(cookies); } @@ -983,13 +983,12 @@ void URLRequest::NotifySSLCertificateError(int net_error, delegate_->OnSSLCertificateError(this, net_error, ssl_info, fatal); } -bool URLRequest::CanGetCookies(const CookieList& cookie_list) const { +bool URLRequest::CanGetCookies() const { DCHECK(!(load_flags_ & LOAD_DO_NOT_SEND_COOKIES)); bool can_get_cookies = g_default_can_use_cookies; if (network_delegate_) { can_get_cookies = - network_delegate_->CanGetCookies(*this, cookie_list, - /*allowed_from_caller=*/true); + network_delegate_->CanGetCookies(*this, /*allowed_from_caller=*/true); } if (!can_get_cookies) @@ -1015,7 +1014,10 @@ net::PrivacyMode URLRequest::DeterminePrivacyMode() const { // Enable privacy mode if flags tell us not send or save cookies. if ((load_flags_ & LOAD_DO_NOT_SEND_COOKIES) || (load_flags_ & LOAD_DO_NOT_SAVE_COOKIES)) { - return PRIVACY_MODE_ENABLED; + // TODO(https://crbug.com/775438): Client certs should always be + // affirmatively omitted for these requests. + return send_client_certs_ ? PRIVACY_MODE_ENABLED + : PRIVACY_MODE_ENABLED_WITHOUT_CLIENT_CERTS; } // Otherwise, check with the delegate if present, or base it off of |