BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 9 insertions, 2 deletions

diff --git a/chromium/net/quic/quic_context.h b/chromium/net/quic/quic_context.h
index 1f3ece3c0c7..e27af55433a 100644
--- a/chromium/net/quic/quic_context.h
+++ b/chromium/net/quic/quic_context.h
@@ -13,8 +13,8 @@
 namespace net {
 
 // Default QUIC version used in absence of any external configuration.
-constexpr quic::ParsedQuicVersion kDefaultSupportedQuicVersion{
-    quic::PROTOCOL_QUIC_CRYPTO, quic::QUIC_VERSION_46};
+constexpr quic::ParsedQuicVersion kDefaultSupportedQuicVersion =
+    quic::ParsedQuicVersion::Q050();
 
 // Returns a list containing only the current default version.
 inline NET_EXPORT_PRIVATE quic::ParsedQuicVersionVector
@@ -165,6 +165,8 @@ struct NET_EXPORT QuicParams {
   // The initial rtt that will be used in crypto handshake if no cached
   // smoothed rtt is present.
   base::TimeDelta initial_rtt_for_handshake;
+  // If true, QUIC with TLS will not try 0-RTT connection.
+  bool disable_tls_zero_rtt = false;
 };
 
 // QuicContext contains QUIC-related variables that are shared across all of the
@@ -187,6 +189,11 @@ class NET_EXPORT_PRIVATE QuicContext {
     return params_.supported_versions;
   }
 
+  void SetHelperForTesting(
+      std::unique_ptr<quic::QuicConnectionHelperInterface> helper) {
+    helper_ = std::move(helper);
+  }
+
  private:
   std::unique_ptr<quic::QuicConnectionHelperInterface> helper_;