Index: net/quic/chromium/quic_chromium_client_session_test.cc |
diff --git a/net/quic/chromium/quic_chromium_client_session_test.cc b/net/quic/chromium/quic_chromium_client_session_test.cc |
index f1a3e30dd22b854a3af64812e3cdee7c578e2124..1420732be3eea4764544b03fde6d4fb80ebad086 100644 |
--- a/net/quic/chromium/quic_chromium_client_session_test.cc |
+++ b/net/quic/chromium/quic_chromium_client_session_test.cc |
@@ -64,9 +64,9 @@ class MockStreamDelegate : public QuicChromiumClientStream::Delegate { |
MOCK_METHOD0(OnSendData, int()); |
MOCK_METHOD2(OnSendDataComplete, int(int, bool*)); |
- MOCK_METHOD2(OnHeadersAvailable, |
+ MOCK_METHOD2(OnInitialHeadersAvailable, |
void(const SpdyHeaderBlock& headers, size_t frame_len)); |
- MOCK_METHOD2(OnHeadersAvailableMock, |
+ MOCK_METHOD2(OnTrailingHeadersAvailable, |
void(const SpdyHeaderBlock& headers, size_t frame_len)); |
MOCK_METHOD2(OnDataReceived, int(const char*, int)); |
MOCK_METHOD0(OnDataAvailable, void()); |
@@ -178,6 +178,7 @@ class QuicChromiumClientSessionTest |
MockCryptoClientStreamFactory crypto_client_stream_factory_; |
QuicClientPushPromiseIndex push_promise_index_; |
QuicServerId server_id_; |
+ MockStreamDelegate delegate_; |
std::unique_ptr<QuicChromiumClientSession> session_; |
TestServerPushDelegate test_push_delegate_; |
QuicConnectionVisitorInterface* visitor_; |
@@ -239,7 +240,7 @@ TEST_P(QuicChromiumClientSessionTest, Handle) { |
TestCompletionCallback callback; |
ASSERT_EQ(OK, handle->RequestStream(/*requires_confirmation=*/false, |
callback.callback())); |
- EXPECT_TRUE(handle->ReleaseStream() != nullptr); |
+ EXPECT_TRUE(handle->ReleaseStream(&delegate_) != nullptr); |
quic_data.Resume(); |
EXPECT_TRUE(quic_data.AllReadDataConsumed()); |
@@ -301,7 +302,7 @@ TEST_P(QuicChromiumClientSessionTest, StreamRequest) { |
TestCompletionCallback callback; |
ASSERT_EQ(OK, handle->RequestStream(/*requires_confirmation=*/false, |
callback.callback())); |
- EXPECT_TRUE(handle->ReleaseStream() != nullptr); |
+ EXPECT_TRUE(handle->ReleaseStream(&delegate_) != nullptr); |
quic_data.Resume(); |
EXPECT_TRUE(quic_data.AllReadDataConsumed()); |
@@ -324,7 +325,7 @@ TEST_P(QuicChromiumClientSessionTest, ConfirmationRequiredStreamRequest) { |
TestCompletionCallback callback; |
ASSERT_EQ(OK, handle->RequestStream(/*requires_confirmation=*/true, |
callback.callback())); |
- EXPECT_TRUE(handle->ReleaseStream() != nullptr); |
+ EXPECT_TRUE(handle->ReleaseStream(&delegate_) != nullptr); |
quic_data.Resume(); |
EXPECT_TRUE(quic_data.AllReadDataConsumed()); |
@@ -352,7 +353,7 @@ TEST_P(QuicChromiumClientSessionTest, StreamRequestBeforeConfirmation) { |
EXPECT_THAT(callback.WaitForResult(), IsOk()); |
- EXPECT_TRUE(handle->ReleaseStream() != nullptr); |
+ EXPECT_TRUE(handle->ReleaseStream(&delegate_) != nullptr); |
quic_data.Resume(); |
EXPECT_TRUE(quic_data.AllReadDataConsumed()); |
@@ -418,7 +419,7 @@ TEST_P(QuicChromiumClientSessionTest, AsyncStreamRequest) { |
session_->OnRstStream(rst); |
ASSERT_TRUE(callback.have_result()); |
EXPECT_THAT(callback.WaitForResult(), IsOk()); |
- EXPECT_TRUE(handle->ReleaseStream() != nullptr); |
+ EXPECT_TRUE(handle->ReleaseStream(&delegate_) != nullptr); |
quic_data.Resume(); |
EXPECT_TRUE(quic_data.AllReadDataConsumed()); |
@@ -923,7 +924,7 @@ TEST_P(QuicChromiumClientSessionTest, MaxNumStreamsViaRequest) { |
session_->OnRstStream(rst1); |
ASSERT_TRUE(callback.have_result()); |
EXPECT_THAT(callback.WaitForResult(), IsOk()); |
- EXPECT_TRUE(handle->ReleaseStream() != nullptr); |
+ EXPECT_TRUE(handle->ReleaseStream(&delegate_) != nullptr); |
} |
TEST_P(QuicChromiumClientSessionTest, GoAwayReceived) { |