Land Recent QUIC Changes

net/quic/crypto/crypto_handshake_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_handshake.h"
 
 #include "net/quic/crypto/aes_128_gcm_encrypter.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_time.h"
 #include "net/quic/test_tools/mock_clock.h"
@@ skipping 27 matching lines @@
  private:
   QuicCryptoServerConfig* const server_config_;
 };
 
 TEST(QuicCryptoServerConfigTest, ServerConfig) {
   QuicCryptoServerConfig server("source address token secret");
   MockClock clock;
   CryptoHandshakeMessage extra_tags;
 
   scoped_ptr<CryptoHandshakeMessage>(
-      server.AddTestingConfig(QuicRandom::GetInstance(), &clock, extra_tags));
+      server.AddDefaultConfig(QuicRandom::GetInstance(), &clock, extra_tags));
 }
 
 TEST(QuicCryptoServerConfigTest, SourceAddressTokens) {
   if (!Aes128GcmEncrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
   QuicCryptoServerConfig server("source address token secret");
   IPAddressNumber ip;
@@ skipping 16 matching lines @@
 
   now = original_time.Add(QuicTime::Delta::FromSeconds(86400 * 7));
   EXPECT_FALSE(peer.ValidateSourceAddressToken(token4, ip4, now));
 
   now = original_time.Subtract(QuicTime::Delta::FromSeconds(3600 * 2));
   EXPECT_FALSE(peer.ValidateSourceAddressToken(token4, ip4, now));
 }
 
 }  // namespace test
 }  // namespace net