Index: net/quic/chromium/quic_stream_factory_test.cc |
diff --git a/net/quic/chromium/quic_stream_factory_test.cc b/net/quic/chromium/quic_stream_factory_test.cc |
index 7f7328fbca6109da7c51c5b184424ba6ee65d6ba..8ba2ff6adf46b40f39a3d6194533d84c75efc603 100644 |
--- a/net/quic/chromium/quic_stream_factory_test.cc |
+++ b/net/quic/chromium/quic_stream_factory_test.cc |
@@ -42,7 +42,6 @@ |
#include "net/quic/test_tools/mock_clock.h" |
#include "net/quic/test_tools/mock_random.h" |
#include "net/quic/test_tools/quic_config_peer.h" |
-#include "net/quic/test_tools/quic_spdy_session_peer.h" |
#include "net/quic/test_tools/quic_test_utils.h" |
#include "net/socket/next_proto.h" |
#include "net/socket/socket_test_util.h" |
@@ -319,14 +318,14 @@ |
} |
std::unique_ptr<QuicEncryptedPacket> ConstructClientRstPacket() { |
- QuicStreamId stream_id = GetNthClientInitiatedStreamId(0); |
+ QuicStreamId stream_id = kClientDataStreamId1; |
return client_maker_.MakeRstPacket(1, true, stream_id, |
QUIC_RST_ACKNOWLEDGEMENT); |
} |
std::unique_ptr<QuicEncryptedPacket> ConstructClientRstPacket( |
QuicPacketNumber packet_number) { |
- QuicStreamId stream_id = GetNthClientInitiatedStreamId(0); |
+ QuicStreamId stream_id = kClientDataStreamId1; |
return client_maker_.MakeRstPacket(packet_number, true, stream_id, |
QUIC_RST_ACKNOWLEDGEMENT); |
} |
@@ -423,7 +422,7 @@ |
socket_data2.AddWrite( |
client_maker_.MakePingPacket(2, /*include_version=*/true)); |
socket_data2.AddWrite(client_maker_.MakeRstPacket( |
- 3, true, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED)); |
+ 3, true, kClientDataStreamId1, QUIC_STREAM_CANCELLED)); |
socket_data2.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -676,14 +675,6 @@ |
void RunTestLoopUntilIdle() { |
while (!runner_->GetPostedTasks().empty()) |
runner_->RunNextTask(); |
- } |
- |
- QuicStreamId GetNthClientInitiatedStreamId(int n) { |
- return test::GetNthClientInitiatedStreamId(version_, n); |
- } |
- |
- QuicStreamId GetNthServerInitiatedStreamId(int n) { |
- return test::GetNthServerInitiatedStreamId(version_, n); |
} |
// Helper methods for tests of connection migration on write error. |
@@ -1386,7 +1377,7 @@ |
ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); |
crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); |
- QuicStreamId stream_id = GetNthClientInitiatedStreamId(0); |
+ QuicStreamId stream_id = kClientDataStreamId1; |
MockQuicData socket_data; |
socket_data.AddWrite(ConstructInitialSettingsPacket()); |
socket_data.AddWrite( |
@@ -1765,9 +1756,9 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite( |
ConstructInitialSettingsPacket(packet_number++, &header_stream_offset)); |
- socket_data.AddWrite(ConstructGetRequestPacket( |
- packet_number++, GetNthClientInitiatedStreamId(0), true, true, |
- &header_stream_offset)); |
+ socket_data.AddWrite(ConstructGetRequestPacket(packet_number++, |
+ kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
if (async_write_before) { |
socket_data.AddWrite(ASYNC, OK); |
packet_number++; |
@@ -1811,12 +1802,12 @@ |
MockQuicData socket_data1; |
socket_data1.AddWrite( |
client_maker_.MakePingPacket(packet_number++, /*include_version=*/true)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- packet_number++, false, GetNthClientInitiatedStreamId(0), |
- QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
+ packet_number++, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, |
+ 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Trigger connection migration. This should cause a PING frame |
@@ -1895,9 +1886,9 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite( |
ConstructInitialSettingsPacket(packet_number++, &header_stream_offset)); |
- socket_data.AddWrite(ConstructGetRequestPacket( |
- packet_number++, GetNthClientInitiatedStreamId(0), true, true, |
- &header_stream_offset)); |
+ socket_data.AddWrite(ConstructGetRequestPacket(packet_number++, |
+ kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
if (async_write_before) { |
socket_data.AddWrite(ASYNC, OK); |
packet_number++; |
@@ -1941,12 +1932,12 @@ |
MockQuicData socket_data1; |
socket_data1.AddWrite( |
client_maker_.MakePingPacket(packet_number++, /*include_version=*/true)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- packet_number++, false, GetNthClientInitiatedStreamId(0), |
- QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
+ packet_number++, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, |
+ 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Trigger connection migration. This should cause a PING frame |
@@ -2069,7 +2060,7 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite(ConstructInitialSettingsPacket()); |
socket_data.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED)); |
+ 2, true, kClientDataStreamId1, QUIC_STREAM_CANCELLED)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2118,7 +2109,7 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite(ConstructInitialSettingsPacket()); |
socket_data.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED)); |
+ 2, true, kClientDataStreamId1, QUIC_STREAM_CANCELLED)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2170,7 +2161,7 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite(ConstructInitialSettingsPacket()); |
socket_data.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_RST_ACKNOWLEDGEMENT)); |
+ 2, true, kClientDataStreamId1, QUIC_RST_ACKNOWLEDGEMENT)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2218,7 +2209,7 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite(ConstructInitialSettingsPacket()); |
socket_data.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_RST_ACKNOWLEDGEMENT)); |
+ 2, true, kClientDataStreamId1, QUIC_RST_ACKNOWLEDGEMENT)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2345,8 +2336,8 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite( |
ConstructInitialSettingsPacket(1, &header_stream_offset)); |
- socket_data.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
+ socket_data.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2393,12 +2384,11 @@ |
MockQuicData socket_data1; |
socket_data1.AddWrite( |
client_maker_.MakePingPacket(3, /*include_version=*/true)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 4, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 4, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Add a new network and notify the stream factory of a new connected network. |
@@ -2562,8 +2552,8 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite( |
ConstructInitialSettingsPacket(1, &header_stream_offset)); |
- socket_data.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
+ socket_data.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2597,12 +2587,11 @@ |
MockQuicData socket_data1; |
socket_data1.AddWrite( |
client_maker_.MakePingPacket(3, /*include_version=*/true)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 4, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 4, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Trigger early connection migration. This should cause a PING frame |
@@ -2687,8 +2676,8 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite( |
ConstructInitialSettingsPacket(1, &header_stream_offset)); |
- socket_data.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
+ socket_data.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2724,12 +2713,11 @@ |
MockQuicData socket_data1; |
socket_data1.AddWrite( |
client_maker_.MakePingPacket(3, /*include_version=*/true)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 4, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 4, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Trigger early connection migration. This should cause a PING frame |
@@ -2807,7 +2795,7 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite(ConstructInitialSettingsPacket()); |
socket_data.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED)); |
+ 2, true, kClientDataStreamId1, QUIC_STREAM_CANCELLED)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2859,7 +2847,7 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite(ConstructInitialSettingsPacket()); |
socket_data.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED)); |
+ 2, true, kClientDataStreamId1, QUIC_STREAM_CANCELLED)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2911,7 +2899,7 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite(ConstructInitialSettingsPacket()); |
socket_data.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED)); |
+ 2, true, kClientDataStreamId1, QUIC_STREAM_CANCELLED)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -2998,14 +2986,13 @@ |
// migration. The request is rewritten to this new socket, and the |
// response to the request is read on this new socket. |
MockQuicData socket_data1; |
- socket_data1.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 3, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 3, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Send GET request on stream. This should cause a write error, which triggers |
@@ -3399,14 +3386,13 @@ |
// migration. The request is rewritten to this new socket, and the |
// response to the request is read on this new socket. |
MockQuicData socket_data1; |
- socket_data1.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 3, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 3, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// First queue a network change notification in the message loop. |
@@ -3497,14 +3483,13 @@ |
// migration. The request is rewritten to this new socket, and the |
// response to the request is read on this new socket. |
MockQuicData socket_data1; |
- socket_data1.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 3, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 3, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Send GET request on stream. This should cause a write error, |
@@ -3618,14 +3603,13 @@ |
// migration. The request is rewritten to this new socket, and the |
// response to the request is read on this new socket. |
MockQuicData socket_data1; |
- socket_data1.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 3, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 3, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
scoped_mock_network_change_notifier_->mock_network_change_notifier() |
@@ -3747,14 +3731,13 @@ |
// migration. The request is rewritten to this new socket, and the |
// response to the request is read on this new socket. |
MockQuicData socket_data1; |
- socket_data1.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
- socket_data1.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data1.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
+ socket_data1.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 3, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 3, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
scoped_mock_network_change_notifier_->mock_network_change_notifier() |
@@ -3853,8 +3836,8 @@ |
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data.AddWrite( |
ConstructInitialSettingsPacket(1, &header_stream_offset)); |
- socket_data.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
+ socket_data.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
socket_data.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -3916,8 +3899,8 @@ |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite( |
ConstructInitialSettingsPacket(1, &header_stream_offset)); |
- socket_data1.AddWrite(ConstructGetRequestPacket( |
- 2, GetNthClientInitiatedStreamId(0), true, true, &header_stream_offset)); |
+ socket_data1.AddWrite(ConstructGetRequestPacket(2, kClientDataStreamId1, true, |
+ true, &header_stream_offset)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -3959,12 +3942,11 @@ |
MockQuicData socket_data2; |
socket_data2.AddWrite( |
client_maker_.MakePingPacket(3, /*include_version=*/true)); |
- socket_data2.AddRead(ConstructOkResponsePacket( |
- 1, GetNthClientInitiatedStreamId(0), false, false)); |
+ socket_data2.AddRead( |
+ ConstructOkResponsePacket(1, kClientDataStreamId1, false, false)); |
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data2.AddWrite(client_maker_.MakeAckAndRstPacket( |
- 4, false, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED, 1, 1, |
- 1, true)); |
+ 4, false, kClientDataStreamId1, QUIC_STREAM_CANCELLED, 1, 1, 1, true)); |
socket_data2.AddSocketDataToFactory(&socket_factory_); |
const uint8_t kTestIpAddress[] = {1, 2, 3, 4}; |
@@ -4059,7 +4041,7 @@ |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(ConstructInitialSettingsPacket()); |
socket_data1.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED)); |
+ 2, true, kClientDataStreamId1, QUIC_STREAM_CANCELLED)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
// Create request and QuicHttpStream. |
@@ -4585,8 +4567,7 @@ |
QuicChromiumClientSession* session = GetActiveSession(host_port_pair_); |
- QuicClientPromisedInfo promised(session, GetNthServerInitiatedStreamId(0), |
- kDefaultUrl); |
+ QuicClientPromisedInfo promised(session, kServerDataStreamId1, kDefaultUrl); |
(*QuicStreamFactoryPeer::GetPushPromiseIndex(factory_.get()) |
->promised_by_url())[kDefaultUrl] = &promised; |
@@ -4608,7 +4589,7 @@ |
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); |
socket_data1.AddWrite(ConstructInitialSettingsPacket()); |
socket_data1.AddWrite(client_maker_.MakeRstPacket( |
- 2, true, GetNthServerInitiatedStreamId(0), QUIC_STREAM_CANCELLED)); |
+ 2, true, kServerDataStreamId1, QUIC_STREAM_CANCELLED)); |
socket_data1.AddSocketDataToFactory(&socket_factory_); |
MockQuicData socket_data2; |
@@ -4631,8 +4612,7 @@ |
string url = "https://www.example.org/"; |
QuicChromiumClientSession* session = GetActiveSession(host_port_pair_); |
- QuicClientPromisedInfo promised(session, GetNthServerInitiatedStreamId(0), |
- kDefaultUrl); |
+ QuicClientPromisedInfo promised(session, kServerDataStreamId1, kDefaultUrl); |
QuicClientPushPromiseIndex* index = |
QuicStreamFactoryPeer::GetPushPromiseIndex(factory_.get()); |