Land Recent QUIC changes.

net/quic/quic_crypto_server_stream_test.cc

 // Copyright (c) 2012 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/quic_crypto_server_stream.h"
 
 #include <map>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 104 matching lines @@
 }
 
 TEST_F(QuicCryptoServerStreamTest, ConnectedAfterCHLO) {
   if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
   // CompleteCryptoHandshake returns the number of client hellos sent. This
   // test should send:
-  //   * One to get a source-address token.
+  //   * One to get a source-address token and certificates.
   //   * One to complete the handshake.
   // TODO(rtenneti): Until we set the crypto_config.SetProofVerifier to enable
   // ProofVerifier in CryptoTestUtils::HandshakeWithFakeClient, we would not
   // have sent the following client hello.
-  //   * One to get the server's certificates
   EXPECT_EQ(2, CompleteCryptoHandshake());
   EXPECT_TRUE(stream_.encryption_established());
   EXPECT_TRUE(stream_.handshake_confirmed());
 }
 
 TEST_F(QuicCryptoServerStreamTest, ZeroRTT) {
   if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
@@ skipping 119 matching lines @@
   // CompleteCryptoHandshake verifies
   // stream_.crypto_negotiated_params().channel_id is correct.
   EXPECT_EQ(2, CompleteCryptoHandshake());
   EXPECT_TRUE(stream_.encryption_established());
   EXPECT_TRUE(stream_.handshake_confirmed());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net