Land Recent QUIC changes.
Merge internal change: 47341065
Fix to ensure the version matches before declaring that the public header
flags exceed the max value. b/9190456
Merge internal change: 47324563
Fixing another backup bug (exposed by the last fix) that if we failed to
write a standalone fin the stream would not be marked as write blocked.
Merge internal change: 47272116
Don't add QuicStreams to ActiveSessionList; Instead call DumpSession on
alive streams via QuicSession.
Merge internal change: 47226512
Making the packet sequence number variable length to minimize bytes on the wire.
Merge internal change: 47220850
Fixing a bug in quic stream where we'd send rst stream packets for
successful streams. The fin bit should be sufficient for both good
request/response pairs and early response pairs.
Merge internal change: 47086343
Don't let FEC packets consume congestion window forever. If a FEC packet
is not acked after a certain time, it is cleared from the congestion
window. This timeout is higher than normal RTO.
Merge internal change: 47056082
Add QuicSession to ActiveSessionList.
Merge internal change: 47048300
Fixing a backup/resumption bug in QUIC.
It's possible to have a full congestion window worth of packets on the wire.
If we are in this state and a session tries to SendStreamData, the
QuicPacketGenerator short-circuits without queuing packets because it checks
to see if the connection CanWrite.
When we get an ack, we check to see if we have locally queued packets, but
never call OnCanWrite on the session to clear any streams which write blocked
without queueing packets.
Merge internal change: 47000173
QUIC: wire up the server-nonce parameters to the server config.
Merge internal change: 46985067
[email protected]
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=204046
Review URL: https://codereview.chromium.org/16256017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204289 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index b29a0e4..7ccd404 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -351,7 +351,7 @@
// Now that the headers have been processed, the callback will return.
EXPECT_EQ(OK, callback_.WaitForResult());
- ASSERT_TRUE(response_.headers.get() != NULL);
+ ASSERT_TRUE(response_.headers);
EXPECT_EQ(404, response_.headers->response_code());
EXPECT_TRUE(response_.headers->HasHeaderValue("Content-Type", "text/plain"));
@@ -393,7 +393,7 @@
// Now that the headers have been processed, the callback will return.
EXPECT_EQ(OK, callback_.WaitForResult());
- ASSERT_TRUE(response_.headers.get() != NULL);
+ ASSERT_TRUE(response_.headers);
EXPECT_EQ(200, response_.headers->response_code());
EXPECT_TRUE(response_.headers->HasHeaderValue("Content-Type", "text/plain"));
@@ -443,7 +443,7 @@
// Since the headers have already arrived, this should return immediately.
EXPECT_EQ(OK, stream_->ReadResponseHeaders(callback_.callback()));
- ASSERT_TRUE(response_.headers.get() != NULL);
+ ASSERT_TRUE(response_.headers);
EXPECT_EQ(200, response_.headers->response_code());
EXPECT_TRUE(response_.headers->HasHeaderValue("Content-Type", "text/plain"));
@@ -505,7 +505,7 @@
// Since the headers have already arrived, this should return immediately.
ASSERT_EQ(OK, stream_->ReadResponseHeaders(callback_.callback()));
- ASSERT_TRUE(response_.headers.get() != NULL);
+ ASSERT_TRUE(response_.headers);
EXPECT_EQ(200, response_.headers->response_code());
EXPECT_TRUE(response_.headers->HasHeaderValue("Content-Type", "text/plain"));
@@ -528,8 +528,7 @@
TEST_F(QuicHttpStreamTest, DestroyedEarly) {
SetRequestString("GET", "/");
AddWrite(SYNCHRONOUS, ConstructDataPacket(1, true, kFin, 0, request_data_));
- AddWrite(SYNCHRONOUS, ConstructRstPacket(2, 3));
- AddWrite(SYNCHRONOUS, ConstructAckPacket(3, 2, 1));
+ AddWrite(SYNCHRONOUS, ConstructAckPacket(2, 2, 1));
use_closing_stream_ = true;
Initialize();
