Land Recent QUIC changes.

net/quic/quic_crypto_server_stream_test.cc

Index: net/quic/quic_crypto_server_stream_test.cc
diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc
index fb829db23d04a9c5f9b4a3e92e6a0a00b1b17e0a..5f72739a8bd72af2193095f26255c1acddba6977 100644
--- a/net/quic/quic_crypto_server_stream_test.cc
+++ b/net/quic/quic_crypto_server_stream_test.cc
@@ -122,12 +122,11 @@ TEST_F(QuicCryptoServerStreamTest, ConnectedAfterCHLO) {
 
   // 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());