Land Recent QUIC Changes.

net/tools/quic/quic_server_session_test.cc

Index: net/tools/quic/quic_server_session_test.cc
diff --git a/net/tools/quic/quic_server_session_test.cc b/net/tools/quic/quic_server_session_test.cc
index 4fc41578cc49bd06306ab56f1d1f36ce219d535d..72c65a88bf46a0c533d1087ff72bb6118cad7275 100644
--- a/net/tools/quic/quic_server_session_test.cc
+++ b/net/tools/quic/quic_server_session_test.cc
@@ -68,7 +68,6 @@ class QuicServerSessionTest : public ::testing::TestWithParam<QuicVersion> {
   QuicServerSessionTest()
       : crypto_config_(QuicCryptoServerConfig::TESTING,
                        QuicRandom::GetInstance()) {
-    config_.SetDefaults();
     config_.SetMaxStreamsPerConnection(kMaxStreamsForTest,
                                        kMaxStreamsForTest);
     config_.SetInitialFlowControlWindowToSend(
@@ -295,8 +294,10 @@ class MockQuicCryptoServerStream : public QuicCryptoServerStream {
       : QuicCryptoServerStream(crypto_config, session) {}
   virtual ~MockQuicCryptoServerStream() {}
 
-  MOCK_METHOD1(SendServerConfigUpdate,
-               void(const CachedNetworkParameters* cached_network_parameters));
+  MOCK_METHOD2(SendServerConfigUpdate,
+               void(const CachedNetworkParameters* cached_network_parameters,
+                    bool on_handshake_complete));
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MockQuicCryptoServerStream);
 };
@@ -365,7 +366,7 @@ TEST_P(QuicServerSessionTest, BandwidthEstimates) {
   expected_network_params.set_serving_region(serving_region);
 
   EXPECT_CALL(*crypto_stream,
-              SendServerConfigUpdate(EqualsProto(expected_network_params)))
+              SendServerConfigUpdate(EqualsProto(expected_network_params), _))
       .Times(1);
   session_->OnCongestionWindowChange(now);
 }