Land Recent QUIC Changes

Handle versioning by closing the connection on version mismatch for now.

Merge internal change: 43606997

Number of cleanups from landing recent crypto changes.

Merge internal change: 43606111

Added delta_time_largest_observed to ReceivedPacketInfo to calculate accurate RTT.

Merge internal change: 43582099

Implement server-side QUIC key expansion. The derived keys are still not being used yet.

TODO: Code is in crypto_test_utils needs to be enabled.

Merge internal change: 43570937

Added AbandoningPacket to congestion control to avoid issue with FEC.

Merge internal change: 43570099

Wait infinite (aka wait for next ack) is not handled correctly.

Merge internal change: 43558636

Enable faster stats for QUIC.

Merge internal change: 43557310

Implement QUIC key expansion on the client side.  The keys are not being used yet.

Merge internal change: 43515237

Add missing quic_stats files.

Track some connection stats.

Merge internal change: 43506869

Fix bug in WriteQueuedPackets

Merge internal change: 43499600

Small comment change in crypto_handshake's ProcessServerHello method.

Merge internal change: 43448804

R=rch@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/12806002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188096 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc
index 995cb6b..db8841d 100644
--- a/net/quic/quic_crypto_server_stream_test.cc
+++ b/net/quic/quic_crypto_server_stream_test.cc
@@ -67,7 +67,7 @@ class QuicCryptoServerStreamTest : public ::testing::Test {
   QuicCryptoServerStreamTest()
       : guid_(1),
         addr_(),
-        connection_(new PacketSavingConnection(guid_, addr_)),
+        connection_(new PacketSavingConnection(guid_, addr_, true)),
         session_(connection_, true),
         stream_(&session_) {
   }