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

chrome/browser/io_thread_unittest.cc

Index: chrome/browser/io_thread_unittest.cc
diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc
index f7899766856fa018cc46d3dc6b67b1e837a0369d..f0301b2853254ac959cd2a64520f5e25e56cfa67 100644
--- a/chrome/browser/io_thread_unittest.cc
+++ b/chrome/browser/io_thread_unittest.cc
@@ -348,13 +348,13 @@ 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);
 }