Land Recent QUIC changes.

net/quic/crypto/crypto_server_test.cc

 // Copyright (c) 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 "net/quic/crypto/crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::string;
 
 namespace net {
 namespace test {
 
 class CryptoServerTest : public ::testing::Test {
  public:
   CryptoServerTest()
       : rand_(QuicRandom::GetInstance()),
-        config_(QuicCryptoServerConfig::TESTING),
+        config_(QuicCryptoServerConfig::TESTING, rand_),
         addr_(ParseIPLiteralToNumber("192.0.2.33", &ip_) ?
               ip_ : IPAddressNumber(), 1) {
   }
 
   virtual void SetUp() {
     scoped_ptr<CryptoHandshakeMessage> msg(
-        config_.AddDefaultConfig(rand_, &clock_, 0));
+        config_.AddDefaultConfig(rand_, &clock_,
+        QuicCryptoServerConfig::ConfigOptions()));
   }
 
   void ShouldSucceed(const CryptoHandshakeMessage& message) {
     string error_details;
     QuicErrorCode error = config_.ProcessClientHello(
         message, 1 /* GUID */, addr_, &clock_,
         rand_, &params_, &out_, &error_details);
 
     ASSERT_EQ(error, QUIC_NO_ERROR)
         << "Message failed with error " << error_details << ": "
@@ skipping 101 matching lines @@
 };
 
 TEST_F(CryptoServerTestNoConfig, DontCrash) {
     ShouldFailMentioning("No config", InchoateClientHello(
         "CHLO",
         NULL));
 }
 
 }  // namespace test
 }  // namespace net