Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/chromium/quic_stream_factory_test.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/chromium/quic_stream_factory.h"
 
 #include <ostream>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 95 matching lines @@
        << (p.enable_connection_racing ? "true" : "false") << " }";
     return os;
   }
 
   QuicVersion version;
   bool enable_connection_racing;
 };
 
 vector<TestParams> GetTestParams() {
   vector<TestParams> params;
-  QuicVersionVector all_supported_versions = QuicSupportedVersions();
+  QuicVersionVector all_supported_versions = AllSupportedVersions();
   for (const QuicVersion version : all_supported_versions) {
     params.push_back(TestParams{version, false});
     params.push_back(TestParams{version, true});
   }
   return params;
 }
 
 // Run QuicStreamFactoryWithDestinationTest instances with all value
 // combinations of version, enable_connection_racting, and destination_type.
 struct PoolingTestParams {
@@ skipping 18 matching lines @@
     return os;
   }
 
   QuicVersion version;
   bool enable_connection_racing;
   DestinationType destination_type;
 };
 
 vector<PoolingTestParams> GetPoolingTestParams() {
   vector<PoolingTestParams> params;
-  QuicVersionVector all_supported_versions = QuicSupportedVersions();
+  QuicVersionVector all_supported_versions = AllSupportedVersions();
   for (const QuicVersion version : all_supported_versions) {
     params.push_back(PoolingTestParams{version, false, SAME_AS_FIRST});
     params.push_back(PoolingTestParams{version, false, SAME_AS_SECOND});
     params.push_back(PoolingTestParams{version, false, DIFFERENT});
     params.push_back(PoolingTestParams{version, true, SAME_AS_FIRST});
     params.push_back(PoolingTestParams{version, true, SAME_AS_SECOND});
     params.push_back(PoolingTestParams{version, true, DIFFERENT});
   }
   return params;
 }
@@ skipping 4951 matching lines @@
   // Clear all cached states.
   factory_->ClearCachedStatesInCryptoConfig(
       base::Callback<bool(const GURL&)>());
   EXPECT_TRUE(test_cases[0].state->certs().empty());
   EXPECT_TRUE(test_cases[1].state->certs().empty());
   EXPECT_TRUE(test_cases[2].state->certs().empty());
 }
 
 }  // namespace test
 }  // namespace net