Landing Recent QUIC changes until Sun Apr 9 16:12:55

net/quic/core/quic_version_manager.cc

Index: net/quic/core/quic_version_manager.cc
diff --git a/net/quic/core/quic_version_manager.cc b/net/quic/core/quic_version_manager.cc
index 0273015800633f0d1049ae6ecc9530ec0ba45e1b..7b11073e0839da45dbdd948201b13ca1e232ad75 100644
--- a/net/quic/core/quic_version_manager.cc
+++ b/net/quic/core/quic_version_manager.cc
@@ -10,7 +10,8 @@
 namespace net {
 
 QuicVersionManager::QuicVersionManager(QuicVersionVector supported_versions)
-    : enable_version_38_(FLAGS_quic_enable_version_38),
+    : enable_version_39_(base::GetFlag(FLAGS_quic_enable_version_39)),
+      enable_version_38_(FLAGS_quic_reloadable_flag_quic_enable_version_38),
       enable_version_37_(FLAGS_quic_reloadable_flag_quic_enable_version_37),
       enable_version_36_(FLAGS_quic_reloadable_flag_quic_enable_version_36_v3),
       disable_version_34_(FLAGS_quic_reloadable_flag_quic_disable_version_34),
@@ -26,13 +27,15 @@ const QuicVersionVector& QuicVersionManager::GetSupportedVersions() {
 }
 
 void QuicVersionManager::MaybeRefilterSupportedVersions() {
-  if (enable_version_38_ != FLAGS_quic_enable_version_38 ||
+  if (enable_version_39_ != base::GetFlag(FLAGS_quic_enable_version_39) ||
+      enable_version_38_ != FLAGS_quic_reloadable_flag_quic_enable_version_38 ||
       enable_version_37_ != FLAGS_quic_reloadable_flag_quic_enable_version_37 ||
       enable_version_36_ !=
           FLAGS_quic_reloadable_flag_quic_enable_version_36_v3 ||
       disable_version_34_ !=
           FLAGS_quic_reloadable_flag_quic_disable_version_34) {
-    enable_version_38_ = FLAGS_quic_enable_version_38;
+    enable_version_39_ = base::GetFlag(FLAGS_quic_enable_version_39);
+    enable_version_38_ = FLAGS_quic_reloadable_flag_quic_enable_version_38;
     enable_version_37_ = FLAGS_quic_reloadable_flag_quic_enable_version_37;
     enable_version_36_ = FLAGS_quic_reloadable_flag_quic_enable_version_36_v3;
     disable_version_34_ = FLAGS_quic_reloadable_flag_quic_disable_version_34;