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

chrome/browser/io_thread_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
@@ skipping 330 matching lines @@
   ConfigureParamsFromFieldTrialsAndCommandLine();
 
   EXPECT_TRUE(params_.enable_quic);
   EXPECT_TRUE(params_.enable_quic_alternative_service_with_different_host);
 }
 
 TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest,
        QuicVersionFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   std::string version =
-      net::QuicVersionToString(net::QuicSupportedVersions().back());
+      net::QuicVersionToString(net::AllSupportedVersions().back());
   command_line_.AppendSwitchASCII("quic-version", version);
 
   ConfigureParamsFromFieldTrialsAndCommandLine();
 
   net::QuicVersionVector supported_versions;
-  supported_versions.push_back(net::QuicSupportedVersions().back());
+  supported_versions.push_back(net::AllSupportedVersions().back());
   EXPECT_EQ(supported_versions, params_.quic_supported_versions);
 }
 
 TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest,
        QuicConnectionOptionsFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   command_line_.AppendSwitchASCII("quic-connection-options", "TIME,TBBR,REJ");
 
   ConfigureParamsFromFieldTrialsAndCommandLine();
 
@@ skipping 87 matching lines @@
   command_line_.AppendSwitchASCII("testing-fixed-http-port", "42");
   command_line_.AppendSwitchASCII("testing-fixed-https-port", "137");
 
   ConfigureParamsFromFieldTrialsAndCommandLine();
 
   EXPECT_EQ(42u, params_.testing_fixed_http_port);
   EXPECT_EQ(137u, params_.testing_fixed_https_port);
 }
 
 }  // namespace test