BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 57 insertions, 21 deletions

diff --git a/chromium/net/base/features.cc b/chromium/net/base/features.cc
index b6b6c2dedd5..1b97b20d324 100644
--- a/chromium/net/base/features.cc
+++ b/chromium/net/base/features.cc
@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "net/base/features.h"
+
+#include <vector>
+
 #include "build/build_config.h"
 
 namespace net {
@@ -11,6 +14,9 @@ namespace features {
 const base::Feature kAcceptLanguageHeader{"AcceptLanguageHeader",
                                           base::FEATURE_ENABLED_BY_DEFAULT};
 
+const base::Feature kCapReferrerToOriginOnCrossOrigin{
+    "CapReferrerToOriginOnCrossOrigin", base::FEATURE_DISABLED_BY_DEFAULT};
+
 const base::Feature kDnsHttpssvc{"DnsHttpssvc",
                                  base::FEATURE_DISABLED_BY_DEFAULT};
 
@@ -20,12 +26,34 @@ const base::FeatureParam<bool> kDnsHttpssvcUseHttpssvc{
 const base::FeatureParam<bool> kDnsHttpssvcUseIntegrity{
     &kDnsHttpssvc, "DnsHttpssvcUseIntegrity", false};
 
+const base::FeatureParam<bool> kDnsHttpssvcEnableQueryOverInsecure{
+    &kDnsHttpssvc, "DnsHttpssvcEnableQueryOverInsecure", false};
+
 const base::FeatureParam<int> kDnsHttpssvcExtraTimeMs{
     &kDnsHttpssvc, "DnsHttpssvcExtraTimeMs", 10};
 
 const base::FeatureParam<int> kDnsHttpssvcExtraTimePercent{
     &kDnsHttpssvc, "DnsHttpssvcExtraTimePercent", 5};
 
+const base::FeatureParam<std::string> kDnsHttpssvcExperimentDomains{
+    &kDnsHttpssvc, "DnsHttpssvcExperimentDomains", ""};
+
+const base::FeatureParam<std::string> kDnsHttpssvcControlDomains{
+    &kDnsHttpssvc, "DnsHttpssvcControlDomains", ""};
+
+const base::FeatureParam<bool> kDnsHttpssvcControlDomainWildcard{
+    &kDnsHttpssvc, "DnsHttpssvcControlDomainWildcard", false};
+
+const base::Feature kAvoidH2Reprioritization{"AvoidH2Reprioritization",
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+
+namespace dns_httpssvc_experiment {
+base::TimeDelta GetExtraTimeAbsolute() {
+  DCHECK(base::FeatureList::IsEnabled(features::kDnsHttpssvc));
+  return base::TimeDelta::FromMilliseconds(kDnsHttpssvcExtraTimeMs.Get());
+}
+}  // namespace dns_httpssvc_experiment
+
 const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
                                           base::FEATURE_DISABLED_BY_DEFAULT};
 
@@ -50,6 +78,28 @@ const base::Feature kPartitionSSLSessionsByNetworkIsolationKey{
     "PartitionSSLSessionsByNetworkIsolationKey",
     base::FEATURE_DISABLED_BY_DEFAULT};
 
+const base::Feature kPartitionExpectCTStateByNetworkIsolationKey{
+    "PartitionExpectCTStateByNetworkIsolationKey",
+    base::FEATURE_DISABLED_BY_DEFAULT};
+
+const base::Feature kExpectCTPruning{"ExpectCTPruning",
+                                     base::FEATURE_ENABLED_BY_DEFAULT};
+
+NET_EXPORT extern const base::FeatureParam<int>
+    kExpectCTPruneMax(&kExpectCTPruning, "ExpectCTPruneMax", 2000);
+NET_EXPORT extern const base::FeatureParam<int>
+    kExpectCTPruneMin(&kExpectCTPruning, "ExpectCTPruneMin", 1800);
+NET_EXPORT extern const base::FeatureParam<int> kExpectCTSafeFromPruneDays(
+    &kExpectCTPruning,
+    "ExpectCTSafeFromPruneDays",
+    40);
+NET_EXPORT extern const base::FeatureParam<int> kExpectCTMaxEntriesPerNik(
+    &kExpectCTPruning,
+    "ExpectCTMaxEntriesPerNik",
+    20);
+NET_EXPORT extern const base::FeatureParam<int>
+    kExpectCTPruneDelaySecs(&kExpectCTPruning, "ExpectCTPruneDelaySecs", 60);
+
 const base::Feature kTLS13KeyUpdate{"TLS13KeyUpdate",
                                     base::FEATURE_DISABLED_BY_DEFAULT};
 
@@ -59,24 +109,11 @@ const base::Feature kPostQuantumCECPQ2{"PostQuantumCECPQ2",
 const base::Feature kNetUnusedIdleSocketTimeout{
     "NetUnusedIdleSocketTimeout", base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kRequestEsniDnsRecords{"RequestEsniDnsRecords",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
-base::TimeDelta EsniDnsMaxAbsoluteAdditionalWait() {
-  DCHECK(base::FeatureList::IsEnabled(kRequestEsniDnsRecords));
-  return base::TimeDelta::FromMilliseconds(
-      kEsniDnsMaxAbsoluteAdditionalWaitMilliseconds.Get());
-}
-const base::FeatureParam<int> kEsniDnsMaxAbsoluteAdditionalWaitMilliseconds{
-    &kRequestEsniDnsRecords, "EsniDnsMaxAbsoluteAdditionalWaitMilliseconds",
-    10};
-const base::FeatureParam<int> kEsniDnsMaxRelativeAdditionalWaitPercent{
-    &kRequestEsniDnsRecords, "EsniDnsMaxRelativeAdditionalWaitPercent", 5};
-
-const base::Feature kSameSiteByDefaultCookies{
-    "SameSiteByDefaultCookies", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kSameSiteByDefaultCookies{"SameSiteByDefaultCookies",
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kCookiesWithoutSameSiteMustBeSecure{
-    "CookiesWithoutSameSiteMustBeSecure", base::FEATURE_DISABLED_BY_DEFAULT};
+    "CookiesWithoutSameSiteMustBeSecure", base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kShortLaxAllowUnsafeThreshold{
     "ShortLaxAllowUnsafeThreshold", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -100,10 +137,6 @@ const base::FeatureParam<int>
         &kRecentCreationTimeGrantsLegacyCookieSemantics,
         "RecentCreationTimeGrantsLegacyCookieSemanticsMilliseconds", 0};
 
-const base::Feature kBlockExternalRequestsFromNonSecureInitiators{
-    "BlockExternalRequestsFromNonSecureInitiators",
-    base::FEATURE_DISABLED_BY_DEFAULT};
-
 #if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED)
 const base::Feature kCertVerifierBuiltinFeature{
     "CertVerifierBuiltin", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -114,7 +147,7 @@ const base::Feature kAppendFrameOriginToNetworkIsolationKey{
 
 const base::Feature kUseRegistrableDomainInNetworkIsolationKey{
     "UseRegistrableDomainInNetworkIsolationKey",
-    base::FEATURE_DISABLED_BY_DEFAULT};
+    base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kTurnOffStreamingMediaCaching{
     "TurnOffStreamingMediaCaching", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -128,5 +161,8 @@ const base::Feature kSchemefulSameSite{"SchemefulSameSite",
 const base::Feature kTLSLegacyCryptoFallbackForMetrics{
     "TLSLegacyCryptoFallbackForMetrics", base::FEATURE_ENABLED_BY_DEFAULT};
 
+const base::Feature kUseLookalikesForNavigationSuggestions{
+    "UseLookalikesForNavigationSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+
 }  // namespace features
 }  // namespace net