BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 9 insertions, 3 deletions

diff --git a/chromium/net/http/http_server_properties_manager.cc b/chromium/net/http/http_server_properties_manager.cc
index 37f54cdf803..fd30463050d 100644
--- a/chromium/net/http/http_server_properties_manager.cc
+++ b/chromium/net/http/http_server_properties_manager.cc
@@ -529,6 +529,7 @@ bool HttpServerPropertiesManager::ParseAlternativeServiceInfoDictOfServer(
   }
 
   // Advertised versions list is optional.
+  // It is only used for PROTOCOL_QUIC_CRYPTO versions.
   if (dict.HasKey(kAdvertisedVersionsKey)) {
     const base::ListValue* versions_list = nullptr;
     if (!dict.GetListWithoutPathExpansion(kAdvertisedVersionsKey,
@@ -545,8 +546,13 @@ bool HttpServerPropertiesManager::ParseAlternativeServiceInfoDictOfServer(
                  << server_str;
         return false;
       }
-      // TODO(nharper): Support ParsedQuicVersions (instead of
-      // QuicTransportVersions) in AlternativeServiceMap.
+      if (!quic::ParsedQuicVersionIsValid(
+              quic::PROTOCOL_QUIC_CRYPTO,
+              quic::QuicTransportVersion(version))) {
+        // This version is not valid, this can happen if we've deprecated
+        // a version that used to be valid.
+        continue;
+      }
       advertised_versions.push_back(quic::ParsedQuicVersion(
           quic::PROTOCOL_QUIC_CRYPTO, quic::QuicTransportVersion(version)));
     }
@@ -864,7 +870,7 @@ void HttpServerPropertiesManager::SaveQuicServerInfoMapToServerPrefs(
                                  std::move(network_isolation_key_value));
     quic_server_pref_dict.SetStringKey(kServerInfoKey, it->second);
 
-    quic_servers_list.GetList().emplace_back(std::move(quic_server_pref_dict));
+    quic_servers_list.Append(std::move(quic_server_pref_dict));
   }
   http_server_properties_dict->SetKey(kQuicServers,
                                       std::move(quic_servers_list));