Landing Recent QUIC changes until Thu Apr 20 2017

net/quic/core/quic_versions.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/quic_versions.h"
 
 #include "net/quic/core/quic_error_codes.h"
 #include "net/quic/core/quic_tag.h"
 #include "net/quic/core/quic_types.h"
 #include "net/quic/platform/api/quic_flags.h"
@@ skipping 13 matching lines @@
 
 QuicVersionVector CurrentSupportedVersions() {
   return FilterSupportedVersions(AllSupportedVersions());
 }
 
 QuicVersionVector FilterSupportedVersions(QuicVersionVector versions) {
   QuicVersionVector filtered_versions(versions.size());
   filtered_versions.clear();  // Guaranteed by spec not to change capacity.
   for (QuicVersion version : versions) {
     if (version == QUIC_VERSION_39) {
-      if (GetQuicFlag(FLAGS_quic_enable_version_39) &&
+      if (FLAGS_quic_enable_version_39 &&
           FLAGS_quic_reloadable_flag_quic_enable_version_38) {
         filtered_versions.push_back(version);
       }
     } else if (version == QUIC_VERSION_38) {
       if (FLAGS_quic_reloadable_flag_quic_enable_version_38) {
         filtered_versions.push_back(version);
       }
     } else {
       filtered_versions.push_back(version);
     }
@@ skipping 65 matching lines @@
   for (size_t i = 0; i < versions.size(); ++i) {
     if (i != 0) {
       result.append(",");
     }
     result.append(QuicVersionToString(versions[i]));
   }
   return result;
 }
 
 }  // namespace net