Index: net/tools/quic/quic_simple_server_stream_test.cc |
diff --git a/net/tools/quic/quic_simple_server_stream_test.cc b/net/tools/quic/quic_simple_server_stream_test.cc |
index ca8ab2a2554622878902033bd6d711beeec04071..64ee14d4e0f0dd4b880f7de31017a3a27353be7b 100644 |
--- a/net/tools/quic/quic_simple_server_stream_test.cc |
+++ b/net/tools/quic/quic_simple_server_stream_test.cc |
@@ -14,6 +14,7 @@ |
#include "net/quic/platform/api/quic_socket_address.h" |
#include "net/quic/platform/api/quic_test.h" |
#include "net/quic/test_tools/crypto_test_utils.h" |
+#include "net/quic/test_tools/quic_spdy_session_peer.h" |
#include "net/quic/test_tools/quic_stream_peer.h" |
#include "net/quic/test_tools/quic_test_utils.h" |
#include "net/test/gtest_util.h" |
@@ -200,8 +201,9 @@ class QuicSimpleServerStreamTest : public QuicTestWithParam<QuicVersion> { |
kInitialStreamFlowControlWindowForTest); |
session_.config()->SetInitialSessionFlowControlWindowToSend( |
kInitialSessionFlowControlWindowForTest); |
- stream_ = new QuicSimpleServerStreamPeer(kClientDataStreamId1, &session_, |
- &response_cache_); |
+ stream_ = new QuicSimpleServerStreamPeer( |
+ QuicSpdySessionPeer::GetNthClientInitiatedStreamId(session_, 0), |
+ &session_, &response_cache_); |
// Register stream_ in dynamic_stream_map_ and pass ownership to session_. |
session_.ActivateStream(QuicWrapUnique(stream_)); |
} |
@@ -444,8 +446,11 @@ TEST_P(QuicSimpleServerStreamTest, SendReponseWithPushResources) { |
stream_->set_fin_received(true); |
InSequence s; |
- EXPECT_CALL(session_, PromisePushResourcesMock(host + request_path, _, |
- kClientDataStreamId1, _)); |
+ EXPECT_CALL( |
+ session_, |
+ PromisePushResourcesMock( |
+ host + request_path, _, |
+ QuicSpdySessionPeer::GetNthClientInitiatedStreamId(session_, 0), _)); |
EXPECT_CALL(session_, WriteHeadersMock(stream_->id(), _, false, _, _)); |
EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)) |
.Times(1) |
@@ -498,14 +503,12 @@ TEST_P(QuicSimpleServerStreamTest, PushResponseOnServerInitiatedStream) { |
.Times(1) |
.WillOnce(Return(QuicConsumedData(kBody.size(), true))); |
server_initiated_stream->PushResponse(std::move(headers)); |
- EXPECT_EQ( |
- kPath, |
- QuicSimpleServerStreamPeer::headers(server_initiated_stream)[":path"] |
- .as_string()); |
- EXPECT_EQ( |
- "GET", |
- QuicSimpleServerStreamPeer::headers(server_initiated_stream)[":method"] |
- .as_string()); |
+ EXPECT_EQ(kPath, QuicSimpleServerStreamPeer::headers( |
+ server_initiated_stream)[":path"] |
+ .as_string()); |
+ EXPECT_EQ("GET", QuicSimpleServerStreamPeer::headers( |
+ server_initiated_stream)[":method"] |
+ .as_string()); |
} |
TEST_P(QuicSimpleServerStreamTest, TestSendErrorResponse) { |