Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3130d9ac authored by uazo's avatar uazo Committed by github-actions[bot]
Browse files

[AUTO] Patches auto-rebase

parent 339bc04d

build/patches/Clear-CORS-Preflight-Cache-on-clearing-data.patch

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p 
diff --git a/services/network/network_context.cc b/services/network/network_context.cc

--- a/services/network/network_context.cc

+++ b/services/network/network_context.cc

@@ -1320,6 +1320,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,

@@ -1324,6 +1324,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,

                                     base::Time end_time,

                                     mojom::ClearDataFilterPtr filter,

                                     ClearHttpCacheCallback callback) {

build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch

+3 −3
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ Subject: Do not check for the presence of use_remoteexec 
diff --git a/build/toolchain/remoteexec_defaults.gni b/build/toolchain/remoteexec_defaults.gni

--- a/build/toolchain/remoteexec_defaults.gni

+++ b/build/toolchain/remoteexec_defaults.gni

@@ -2,4 +2,4 @@

@@ -1,4 +1,4 @@

 # rbe.gni and autoninja.py will read this file to get the default

 # value of use_reclient.

 # TODO(crbug.com/341167943): Use reclient only if use_siso=false.

 use_reclient_on_siso = true

 use_reclient_on_siso = false

-use_reclient_on_ninja = true

+use_reclient_on_ninja = false

--

build/patches/Lock-Profile-Cookie-Database.patch

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ new file mode 100644 
diff --git a/services/network/network_context.cc b/services/network/network_context.cc

--- a/services/network/network_context.cc

+++ b/services/network/network_context.cc

@@ -3122,7 +3122,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const {

@@ -3126,7 +3126,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const {

 

 #if BUILDFLAG(IS_WIN)

   const bool enable_exclusive_access =

build/patches/Partition-HSTS-cache-by-NAK.patch

+12 −12
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque 
diff --git a/services/network/network_context.cc b/services/network/network_context.cc

--- a/services/network/network_context.cc

+++ b/services/network/network_context.cc

@@ -2046,6 +2046,7 @@ void NetworkContext::CreateHostResolver(

@@ -2050,6 +2050,7 @@ void NetworkContext::CreateHostResolver(

 void NetworkContext::VerifyCertInternal(

     const scoped_refptr<net::X509Certificate>& certificate,

     const net::HostPortPair& host_port,
@@ -802,7 +802,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
     const std::string& ocsp_result,

     const std::string& sct_list,

     CTVerificationMode ct_verification_mode,

@@ -2057,6 +2058,7 @@ void NetworkContext::VerifyCertInternal(

@@ -2061,6 +2062,7 @@ void NetworkContext::VerifyCertInternal(

   pending_cert_verify->result = std::make_unique<net::CertVerifyResult>();

   pending_cert_verify->certificate = certificate;

   pending_cert_verify->host_port = host_port;
@@ -810,7 +810,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
   pending_cert_verify->ocsp_result = ocsp_result;

   pending_cert_verify->sct_list = sct_list;

   pending_cert_verify->ct_verification_mode = ct_verification_mode;

@@ -2082,20 +2084,22 @@ void NetworkContext::VerifyCertInternal(

@@ -2086,20 +2088,22 @@ void NetworkContext::VerifyCertInternal(

 void NetworkContext::VerifyCert(

     const scoped_refptr<net::X509Certificate>& certificate,

     const net::HostPortPair& host_port,
@@ -835,7 +835,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
                      CTVerificationMode::kSignedExchange, std::move(callback));

 }

 

@@ -2121,17 +2125,19 @@ void NetworkContext::SetCorsOriginAccessListsForOrigin(

@@ -2125,17 +2129,19 @@ void NetworkContext::SetCorsOriginAccessListsForOrigin(

   std::move(callback).Run();

 }
@@ -858,7 +858,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
                                          bool is_top_level_nav,

                                          IsHSTSActiveForHostCallback callback) {

   net::TransportSecurityState* security_state =

@@ -2143,10 +2149,10 @@ void NetworkContext::IsHSTSActiveForHost(const std::string& host,

@@ -2147,10 +2153,10 @@ void NetworkContext::IsHSTSActiveForHost(const std::string& host,

   }

 

   std::move(callback).Run(
@@ -871,7 +871,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
                                   GetHSTSStateCallback callback) {

   base::Value::Dict result;

 

@@ -2184,10 +2190,10 @@ void NetworkContext::GetHSTSState(const std::string& domain,

@@ -2188,10 +2194,10 @@ void NetworkContext::GetHSTSState(const std::string& domain,

       net::TransportSecurityState::STSState dynamic_sts_state;

       net::TransportSecurityState::PKPState dynamic_pkp_state;

       bool found_sts_dynamic = transport_security_state->GetDynamicSTSState(
@@ -884,7 +884,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
       if (found_sts_dynamic) {

         result.Set("dynamic_upgrade_mode",

                    static_cast<int>(dynamic_sts_state.upgrade_mode));

@@ -2225,6 +2231,7 @@ void NetworkContext::GetHSTSState(const std::string& domain,

@@ -2229,6 +2235,7 @@ void NetworkContext::GetHSTSState(const std::string& domain,

 }

 

 void NetworkContext::DeleteDynamicDataForHost(
@@ -892,7 +892,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
     const std::string& host,

     DeleteDynamicDataForHostCallback callback) {

   net::TransportSecurityState* transport_security_state =

@@ -2235,7 +2242,7 @@ void NetworkContext::DeleteDynamicDataForHost(

@@ -2239,7 +2246,7 @@ void NetworkContext::DeleteDynamicDataForHost(

   }

 

   std::move(callback).Run(
@@ -901,7 +901,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
 }

 

 void NetworkContext::EnableStaticKeyPinningForTesting(

@@ -2279,7 +2286,7 @@ void NetworkContext::PreconnectSockets(

@@ -2283,7 +2290,7 @@ void NetworkContext::PreconnectSockets(

   DCHECK(!require_network_anonymization_key_ ||

          !network_anonymization_key.IsEmpty());
@@ -910,7 +910,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
 

   // |PreconnectSockets| may receive arguments from the renderer, which is not

   // guaranteed to validate them.

@@ -3092,7 +3099,9 @@ void NetworkContext::OnConnectionError() {

@@ -3096,7 +3103,9 @@ void NetworkContext::OnConnectionError() {

   }

 }
@@ -921,7 +921,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
   // TODO(lilyhoughton) This needs to be gotten rid of once explicit

   // construction with a URLRequestContext is no longer supported.

 

@@ -3118,6 +3127,7 @@ GURL NetworkContext::GetHSTSRedirectForPreconnect(const GURL& original_url) {

@@ -3122,6 +3131,7 @@ GURL NetworkContext::GetHSTSRedirectForPreconnect(const GURL& original_url) {

   // top-level navigation so we need to disallow HSTS upgrades for every

   // preconnect.

   if (!url_request_context_->transport_security_state()->ShouldUpgradeToSSL(
@@ -929,7 +929,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 
           original_url.host(), /*is_top_level_nav=*/false)) {

     RecordHSTSPreconnectUpgradeReason(

         HSTSRedirectUpgradeReason::kNotUpgradedNoHSTSPin);

@@ -3167,7 +3177,8 @@ void NetworkContext::OnVerifyCertComplete(uint64_t cert_verify_id, int result) {

@@ -3171,7 +3181,8 @@ void NetworkContext::OnVerifyCertComplete(uint64_t cert_verify_id, int result) {

         url_request_context_->transport_security_state()->CheckPublicKeyPins(

             pending_cert_verify->host_port.host(),

             pending_cert_verify->result->is_issued_by_known_root,

build/patches/Show-NTP-at-startup.patch

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -334,6 +334,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -335,6 +335,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &kSearchInCCT,

     &kSearchInCCTAlternateTapHandling,

     &kSearchResumptionModuleAndroid,