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 113 matching lines @@
 }
 
 TEST_P(QuicCryptoServerStreamTest, ConnectedAfterCHLO) {
   // CompleteCryptoHandshake returns the number of client hellos sent. This
   // test should send:
   //   * One to get a source-address token and certificates.
   //   * One to complete the handshake.
   EXPECT_EQ(2, CompleteCryptoHandshake());
   EXPECT_TRUE(stream_.encryption_established());
   EXPECT_TRUE(stream_.handshake_confirmed());
+  EXPECT_EQ(1, stream_.num_server_config_update_messages_sent());
 }
 
 TEST_P(QuicCryptoServerStreamTest, ZeroRTT) {
   PacketSavingConnection* client_conn = new PacketSavingConnection(false);
   PacketSavingConnection* server_conn = new PacketSavingConnection(false);
   client_conn->AdvanceTime(QuicTime::Delta::FromSeconds(100000));
   server_conn->AdvanceTime(QuicTime::Delta::FromSeconds(100000));
 
   QuicConfig client_config;
   client_config.SetDefaults();
@@ skipping 72 matching lines @@
     EXPECT_EQ(1u, messages_moved.first);
     EXPECT_EQ(1u, messages_moved.second);
     EXPECT_TRUE(client->handshake_confirmed());
     EXPECT_TRUE(server->handshake_confirmed());
   } else {
     CryptoTestUtils::CommunicateHandshakeMessages(
         client_conn, client.get(), server_conn, server.get());
   }
 
   EXPECT_EQ(1, client->num_sent_client_hellos());
+  EXPECT_EQ(1, server->num_server_config_update_messages_sent());
 }
 
 TEST_P(QuicCryptoServerStreamTest, MessageAfterHandshake) {
   CompleteCryptoHandshake();
   EXPECT_CALL(*connection_, SendConnectionClose(
       QUIC_CRYPTO_MESSAGE_AFTER_HANDSHAKE_COMPLETE));
   message_.set_tag(kCHLO);
   ConstructHandshakeMessage();
   stream_.ProcessRawData(message_data_->data(), message_data_->length());
 }
@@ skipping 33 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