Index: net/quic/chromium/quic_chromium_client_stream_test.cc |
diff --git a/net/quic/chromium/quic_chromium_client_stream_test.cc b/net/quic/chromium/quic_chromium_client_stream_test.cc |
index 0a3888a3a59bfd8d6dc8acdea222e1a18babaf95..2d0a864795918ea2d41803cb0729bcc9b0ea9a6f 100644 |
--- a/net/quic/chromium/quic_chromium_client_stream_test.cc |
+++ b/net/quic/chromium/quic_chromium_client_stream_test.cc |
@@ -44,13 +44,6 @@ class MockDelegate : public QuicChromiumClientStream::Delegate { |
MOCK_METHOD0(OnSendData, int()); |
MOCK_METHOD2(OnSendDataComplete, int(int, bool*)); |
- void OnInitialHeadersAvailable(const SpdyHeaderBlock& headers, |
- size_t frame_len) override { |
- headers_ = headers.Clone(); |
- OnInitialHeadersAvailableMock(headers, frame_len); |
- } |
- MOCK_METHOD2(OnInitialHeadersAvailableMock, |
- void(const SpdyHeaderBlock& headers, size_t frame_len)); |
void OnTrailingHeadersAvailable(const SpdyHeaderBlock& headers, |
size_t frame_len) override { |
trailers_ = headers.Clone(); |
@@ -261,9 +254,10 @@ class QuicChromiumClientStreamTest |
QuicHeaderList ProcessHeadersFull(const SpdyHeaderBlock& headers) { |
QuicHeaderList h = ProcessHeaders(headers); |
- EXPECT_CALL(delegate_, OnInitialHeadersAvailableMock( |
- _, h.uncompressed_header_bytes())); |
- base::RunLoop().RunUntilIdle(); |
+ TestCompletionCallback callback; |
+ EXPECT_EQ( |
+ static_cast<int>(h.uncompressed_header_bytes()), |
+ handle_->ReadInitialHeaders(&delegate_.headers_, callback.callback())); |
EXPECT_EQ(headers, delegate_.headers_); |
EXPECT_TRUE(stream_->header_list().empty()); |
return h; |
@@ -739,10 +733,11 @@ TEST_P(QuicChromiumClientStreamTest, HeadersBeforeDelegate) { |
EXPECT_TRUE(delegate2_.headers_.empty()); |
// Now set the delegate and verify that the headers are delivered. |
- EXPECT_CALL(delegate2_, OnInitialHeadersAvailableMock( |
- _, header_list.uncompressed_header_bytes())); |
handle2_ = stream2->CreateHandle(&delegate2_); |
- base::RunLoop().RunUntilIdle(); |
+ TestCompletionCallback callback; |
+ EXPECT_EQ( |
+ static_cast<int>(header_list.uncompressed_header_bytes()), |
+ handle2_->ReadInitialHeaders(&delegate2_.headers_, callback.callback())); |
EXPECT_EQ(headers_, delegate2_.headers_); |
// Both delegates should be notified that theirs streams are closed. |
@@ -771,10 +766,11 @@ TEST_P(QuicChromiumClientStreamTest, HeadersAndDataBeforeDelegate) { |
// Now set the delegate and verify that the headers are delivered, but |
// not the data, which needs to be read explicitly. |
- EXPECT_CALL(delegate2_, OnInitialHeadersAvailableMock( |
- _, header_list.uncompressed_header_bytes())); |
handle2_ = stream2->CreateHandle(&delegate2_); |
- base::RunLoop().RunUntilIdle(); |
+ TestCompletionCallback callback; |
+ EXPECT_EQ( |
+ static_cast<int>(header_list.uncompressed_header_bytes()), |
+ handle2_->ReadInitialHeaders(&delegate2_.headers_, callback.callback())); |
EXPECT_EQ(headers_, delegate2_.headers_); |
base::RunLoop().RunUntilIdle(); |