Landing 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 98492f19ebc26edfd941e80a4c6bde3037315e8f..7c529afc12264afe6ba14c552b188c7489ad9b5f 100644
--- a/net/quic/quic_crypto_server_stream_test.cc
+++ b/net/quic/quic_crypto_server_stream_test.cc
@@ -275,6 +275,12 @@ TEST_P(QuicCryptoServerStreamTest, ChannelIDAsync) {
   EXPECT_TRUE(stream_.handshake_confirmed());
 }
 
+TEST_P(QuicCryptoServerStreamTest, OnlySendSCUPAfterHandshakeComplete) {
+  // An attempt to send a SCUP before completing handshake should fail.
+  stream_.SendServerConfigUpdate(NULL);
+  EXPECT_EQ(0, stream_.num_server_config_update_messages_sent());
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace net