Landing Recent QUIC changes until Thu Apr 20 2017

net/quic/core/quic_versions_test.cc

Index: net/quic/core/quic_versions_test.cc
diff --git a/net/quic/core/quic_versions_test.cc b/net/quic/core/quic_versions_test.cc
index 0b392a9e5b2a445695f4e409810639d382bc90c6..42493cf79681973f19b575a8680c8ee7f033aa5e 100644
--- a/net/quic/core/quic_versions_test.cc
+++ b/net/quic/core/quic_versions_test.cc
@@ -147,7 +147,7 @@ TEST(QuicVersionsTest, FilterSupportedVersionsNo39) {
                                     QUIC_VERSION_39};
 
   FLAGS_quic_reloadable_flag_quic_enable_version_38 = true;
-  SetQuicFlag(&FLAGS_quic_enable_version_39, false);
+  FLAGS_quic_enable_version_39 = false;
 
   QuicVersionVector filtered_versions = FilterSupportedVersions(all_versions);
   ASSERT_EQ(4u, filtered_versions.size());
@@ -164,7 +164,7 @@ TEST(QuicVersionsTest, FilterSupportedVersionsAllVersions) {
                                     QUIC_VERSION_39};
 
   FLAGS_quic_reloadable_flag_quic_enable_version_38 = true;
-  SetQuicFlag(&FLAGS_quic_enable_version_39, true);
+  FLAGS_quic_enable_version_39 = true;
 
   QuicVersionVector filtered_versions = FilterSupportedVersions(all_versions);
   ASSERT_EQ(all_versions, filtered_versions);