BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 8 insertions, 4 deletions

diff --git a/chromium/net/http/alternative_service.cc b/chromium/net/http/alternative_service.cc
index 56273b992fc..e43ce7d71f2 100644
--- a/chromium/net/http/alternative_service.cc
+++ b/chromium/net/http/alternative_service.cc
@@ -47,13 +47,14 @@ quic::ParsedQuicVersion ParsedQuicVersionFromAlpn(
     if (AlpnForVersion(version) == str)
       return version;
   }
-  return {quic::PROTOCOL_UNSUPPORTED, quic::QUIC_VERSION_UNSUPPORTED};
+  return quic::ParsedQuicVersion::Unsupported();
 }
 
 }  // anonymous namespace
 
 void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage,
-                                     bool proxy_server_used) {
+                                     bool proxy_server_used,
+                                     bool is_google_host) {
   if (proxy_server_used) {
     DCHECK_LE(usage, ALTERNATE_PROTOCOL_USAGE_LOST_RACE);
     LOCAL_HISTOGRAM_ENUMERATION("Net.QuicAlternativeProxy.Usage",
@@ -62,6 +63,10 @@ void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage,
   } else {
     UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
                               ALTERNATE_PROTOCOL_USAGE_MAX);
+    if (is_google_host) {
+      UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsageGoogle", usage,
+                                ALTERNATE_PROTOCOL_USAGE_MAX);
+    }
   }
 }
 
@@ -201,8 +206,7 @@ AlternativeServiceInfoVector ProcessAlternativeServices(
     } else if (!IsAlternateProtocolValid(protocol)) {
       quic::ParsedQuicVersion version = ParsedQuicVersionFromAlpn(
           alternative_service_entry.protocol_id, supported_quic_versions);
-      if (version.handshake_protocol == quic::PROTOCOL_UNSUPPORTED ||
-          version.transport_version == quic::QUIC_VERSION_UNSUPPORTED) {
+      if (version == quic::ParsedQuicVersion::Unsupported()) {
         continue;
       }
       protocol = kProtoQUIC;