Landing Recent QUIC changes until Mon Apr 17 2017

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 7b11073e0839da45dbdd948201b13ca1e232ad75..fb8bdf01ca04043e0df8a4a23c818d4c13040d20 100644
--- a/net/quic/core/quic_version_manager.cc
+++ b/net/quic/core/quic_version_manager.cc
@@ -4,17 +4,14 @@
 
 #include "net/quic/core/quic_version_manager.h"
 
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_versions.h"
+#include "net/quic/platform/api/quic_flags.h"
 
 namespace net {
 
 QuicVersionManager::QuicVersionManager(QuicVersionVector supported_versions)
-    : enable_version_39_(base::GetFlag(FLAGS_quic_enable_version_39)),
+    : enable_version_39_(GetQuicFlag(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),
       allowed_supported_versions_(supported_versions),
       filtered_supported_versions_(
           FilterSupportedVersions(supported_versions)) {}
@@ -27,18 +24,10 @@ const QuicVersionVector& QuicVersionManager::GetSupportedVersions() {
 }
 
 void QuicVersionManager::MaybeRefilterSupportedVersions() {
-  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_39_ = base::GetFlag(FLAGS_quic_enable_version_39);
+  if (enable_version_39_ != GetQuicFlag(FLAGS_quic_enable_version_39) ||
+      enable_version_38_ != FLAGS_quic_reloadable_flag_quic_enable_version_38) {
+    enable_version_39_ = GetQuicFlag(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;
     RefilterSupportedVersions();
   }
 }