Index: net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc |
diff --git a/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc b/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc |
index cc66744aa1891214854ef36af693c4757dc6e64e..fe867052cfa9a8a2b26d5a42e9e7e6af256eeda4 100644 |
--- a/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc |
+++ b/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc |
@@ -41,7 +41,6 @@ |
#include "net/quic/test_tools/mock_clock.h" |
#include "net/quic/test_tools/mock_random.h" |
#include "net/quic/test_tools/quic_connection_peer.h" |
-#include "net/quic/test_tools/quic_spdy_session_peer.h" |
#include "net/quic/test_tools/quic_test_utils.h" |
#include "net/socket/socket_test_util.h" |
#include "net/test/gtest_util.h" |
@@ -357,7 +356,7 @@ |
: crypto_config_(crypto_test_utils::ProofVerifierForTesting()), |
read_buffer_(new IOBufferWithSize(4096)), |
connection_id_(2), |
- stream_id_(GetNthClientInitiatedStreamId(0)), |
+ stream_id_(kClientDataStreamId1), |
client_maker_(GetParam(), |
connection_id_, |
&clock_, |
@@ -680,10 +679,6 @@ |
const BoundTestNetLog& net_log() const { return net_log_; } |
QuicChromiumClientSession* session() const { return session_.get(); } |
- |
- QuicStreamId GetNthClientInitiatedStreamId(int n) { |
- return QuicSpdySessionPeer::GetNthClientInitiatedStreamId(*session_, n); |
- } |
protected: |
BoundTestNetLog net_log_; |
@@ -722,7 +717,7 @@ |
size_t spdy_request_headers_frame_length; |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructRequestHeadersPacketInner( |
- 1, GetNthClientInitiatedStreamId(0), kFin, DEFAULT_PRIORITY, |
+ 1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset)); |
AddWrite(ConstructClientAckPacket(3, 3, 1, 1)); |
@@ -819,13 +814,11 @@ |
SetRequest("GET", "/", DEFAULT_PRIORITY); |
QuicStreamOffset offset = 0; |
AddWrite(ConstructRequestHeadersPacketInner( |
- 1, GetNthClientInitiatedStreamId(0), kFin, DEFAULT_PRIORITY, nullptr, |
- &offset)); |
+ 1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY, nullptr, &offset)); |
// SetRequest() again for second request as |request_headers_| was moved. |
SetRequest("GET", "/", DEFAULT_PRIORITY); |
AddWrite(ConstructRequestHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(1), kFin, DEFAULT_PRIORITY, nullptr, |
- &offset)); |
+ 2, kClientDataStreamId2, kFin, DEFAULT_PRIORITY, nullptr, &offset)); |
AddWrite(ConstructInitialSettingsPacket(3, &offset)); |
AddWrite(ConstructClientAckPacket(4, 3, 1, 1)); |
Initialize(); |
@@ -858,12 +851,12 @@ |
// Server sends the response headers. |
offset = 0; |
ProcessPacket(ConstructResponseHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(0), kFin, |
- ConstructResponseHeaders("200"), nullptr, &offset)); |
+ 2, kClientDataStreamId1, kFin, ConstructResponseHeaders("200"), nullptr, |
+ &offset)); |
ProcessPacket(ConstructResponseHeadersPacketInner( |
- 3, GetNthClientInitiatedStreamId(1), kFin, |
- ConstructResponseHeaders("200"), nullptr, &offset)); |
+ 3, kClientDataStreamId2, kFin, ConstructResponseHeaders("200"), nullptr, |
+ &offset)); |
delegate->WaitUntilNextCallback(); // OnHeadersReceived |
delegate2->WaitUntilNextCallback(); // OnHeadersReceived |
@@ -893,7 +886,7 @@ |
const char kBody2[] = "data keep coming"; |
std::vector<std::string> two_writes = {kBody1, kBody2}; |
AddWrite(ConstructRequestHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY, |
+ 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructClientMultipleDataFramesPacket(3, kIncludeVersion, !kFin, 0, |
{kBody1, kBody2})); |
@@ -1201,7 +1194,7 @@ |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset)); |
AddWrite(ConstructRequestHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY, |
+ 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructDataPacket(3, kIncludeVersion, kFin, 0, kUploadData, |
&client_maker_)); |
@@ -1359,7 +1352,7 @@ |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset)); |
AddWrite(ConstructRequestHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY, |
+ 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructAckAndDataPacket(3, !kIncludeVersion, 2, 1, 1, !kFin, 0, |
kUploadData, &client_maker_)); |
@@ -1446,7 +1439,7 @@ |
size_t spdy_request_headers_frame_length; |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructRequestHeadersPacketInner( |
- 1, GetNthClientInitiatedStreamId(0), kFin, DEFAULT_PRIORITY, |
+ 1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset)); |
Initialize(); |
@@ -1487,7 +1480,7 @@ |
size_t spdy_request_headers_frame_length; |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructRequestHeadersPacketInner( |
- 1, GetNthClientInitiatedStreamId(0), kFin, DEFAULT_PRIORITY, |
+ 1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset)); |
// Why does QUIC ack Rst? Is this expected? |
@@ -1549,7 +1542,7 @@ |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset)); |
AddWrite(ConstructRequestHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY, |
+ 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
Initialize(); |
@@ -1609,7 +1602,7 @@ |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset)); |
AddWrite(ConstructRequestHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY, |
+ 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructClientAckAndRstStreamPacket(3, 2, 1, 1)); |
@@ -1663,7 +1656,7 @@ |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset)); |
AddWrite(ConstructRequestHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY, |
+ 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructClientAckAndRstStreamPacket(3, 2, 1, 1)); |
@@ -1709,7 +1702,7 @@ |
QuicStreamOffset header_stream_offset = 0; |
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset)); |
AddWrite(ConstructRequestHeadersPacketInner( |
- 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY, |
+ 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY, |
&spdy_request_headers_frame_length, &header_stream_offset)); |
AddWrite(ConstructClientAckPacket(3, 3, 1, 1)); |
AddWrite(ConstructClientRstStreamPacket(4)); |