Land Recent QUIC changes.

net/quic/quic_end_to_end_unittest.cc

 // Copyright 2013 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/base/test_completion_callback.h"
@@ skipping 120 matching lines @@
     QuicInMemoryCachePeer::ResetForTests();
   }
 
   // Starts the QUIC server listening on a random port.
   void StartServer() {
     net::IPAddressNumber ip;
     CHECK(net::ParseIPLiteralToNumber("127.0.0.1", &ip));
     server_address_ = IPEndPoint(ip, 0);
     server_config_.SetDefaults();
     server_thread_.reset(new ServerThread(server_address_, server_config_,
+                                          QuicSupportedVersions(),
                                           strike_register_no_startup_period_));
     server_thread_->Start();
     server_thread_->listening()->Wait();
     server_address_ = IPEndPoint(server_address_.address(),
                                  server_thread_->GetPort());
     server_started_ = true;
   }
 
   // Stops the QUIC server.
   void StopServer() {
@@ skipping 149 matching lines @@
   base::MessageLoop::current()->Run();
 
   for (size_t i = 0; i < num_requests; ++i) {
     CheckResponse(*consumers[i], "HTTP/1.1 200 OK", kResponseBody);
   }
   STLDeleteElements(&consumers);
 }
 
 }  // namespace test
 }  // namespace net