Land Recent QUIC changes.

Implement the variable length changes necessary to easily accommodate
both the new STREAM framing format, as well as the existing format.

Merge internal change: 48567379

Stop storing two copies of the version (one in Connection, one in Framer),
instead only the Framer stores the version.

Merge internal change: 48452109

Cleaning up QuicPacketEntropyManager as part of an effort reduce
EndToEndTest::LargePostFEC flakiness, and avoid sending incorrect
entropy.

Merge internal change: 48443412

Enabling a handful of cert selection tests for secure QUIC

Merge internal change: 48306046

QUIC: support default certificates.

In the event that the client doesn't supply an SNI value but does request a
certificate, the server will use its default certificate.

Merge internal change: 48305575

Added more comments to QuicPacket{Public,Private}Flags enums.

Merge internal change: 48304472

R=rch@chromium.org

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

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

1 files changed, 8 insertions, 5 deletions

diff --git a/net/quic/quic_packet_creator_test.cc b/net/quic/quic_packet_creator_test.cc
index f972182..7a8daa4c 100644
--- a/net/quic/quic_packet_creator_test.cc
+++ b/net/quic/quic_packet_creator_test.cc
@@ -224,14 +224,17 @@ TEST_P(QuicPacketCreatorTest, CreateStreamFrameTooLarge) {
     creator_.StopSendingVersion();
   }
   // A string larger than fits into a frame.
+  size_t payload_length;
   creator_.options()->max_packet_length = GetPacketLengthForOneStream(
       QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
-      NOT_IN_FEC_GROUP, 4);
+      NOT_IN_FEC_GROUP, &payload_length);
   QuicFrame frame;
-  size_t consumed = creator_.CreateStreamFrame(1u, "testTooLong", 0u, true,
-                                               &frame);
-  EXPECT_EQ(4u, consumed);
-  CheckStreamFrame(frame, 1u, "test", 0u, false);
+  const string too_long_payload(payload_length * 2, 'a');
+  size_t consumed = creator_.CreateStreamFrame(
+      1u, too_long_payload, 0u, true, &frame);
+  EXPECT_EQ(payload_length, consumed);
+  const string payload(payload_length, 'a');
+  CheckStreamFrame(frame, 1u, payload, 0u, false);
   delete frame.stream_frame;
 }