| Index: net/spdy/spdy_http_stream_spdy3_unittest.cc
|
| diff --git a/net/spdy/spdy_http_stream_spdy3_unittest.cc b/net/spdy/spdy_http_stream_spdy3_unittest.cc
|
| index 2e42f704fbb81403f4a3e64edb330e847f3f9f50..f9482d68ea1aa63b2cc2e6f69c22a3180f7db13a 100644
|
| --- a/net/spdy/spdy_http_stream_spdy3_unittest.cc
|
| +++ b/net/spdy/spdy_http_stream_spdy3_unittest.cc
|
| @@ -316,7 +316,8 @@ TEST_F(SpdyHttpStreamSpdy3Test, LoadTimingTwoRequests) {
|
| // Read stream 1 to completion, before making sure we can still read load
|
| // timing from both streams.
|
| scoped_refptr<IOBuffer> buf1(new IOBuffer(1));
|
| - ASSERT_EQ(0, http_stream1->ReadResponseBody(buf1, 1, callback1.callback()));
|
| + ASSERT_EQ(
|
| + 0, http_stream1->ReadResponseBody(buf1.get(), 1, callback1.callback()));
|
|
|
| // Stream 1 has been read to completion.
|
| TestLoadTimingNotReused(*http_stream1);
|
| @@ -488,27 +489,24 @@ TEST_F(SpdyHttpStreamSpdy3Test, DelayedSendChunkedPost) {
|
| deterministic_data()->RunFor(1);
|
| scoped_refptr<IOBuffer> buf1(new IOBuffer(kUploadDataSize));
|
| ASSERT_EQ(kUploadDataSize,
|
| - http_stream->ReadResponseBody(buf1,
|
| - kUploadDataSize,
|
| - callback.callback()));
|
| + http_stream->ReadResponseBody(
|
| + buf1.get(), kUploadDataSize, callback.callback()));
|
| EXPECT_EQ(kUploadData, std::string(buf1->data(), kUploadDataSize));
|
|
|
| // Read and check |chunk2| response.
|
| deterministic_data()->RunFor(1);
|
| scoped_refptr<IOBuffer> buf2(new IOBuffer(kUploadData1Size));
|
| ASSERT_EQ(kUploadData1Size,
|
| - http_stream->ReadResponseBody(buf2,
|
| - kUploadData1Size,
|
| - callback.callback()));
|
| + http_stream->ReadResponseBody(
|
| + buf2.get(), kUploadData1Size, callback.callback()));
|
| EXPECT_EQ(kUploadData1, std::string(buf2->data(), kUploadData1Size));
|
|
|
| // Read and check |chunk3| response.
|
| deterministic_data()->RunFor(1);
|
| scoped_refptr<IOBuffer> buf3(new IOBuffer(kUploadDataSize));
|
| ASSERT_EQ(kUploadDataSize,
|
| - http_stream->ReadResponseBody(buf3,
|
| - kUploadDataSize,
|
| - callback.callback()));
|
| + http_stream->ReadResponseBody(
|
| + buf3.get(), kUploadDataSize, callback.callback()));
|
| EXPECT_EQ(kUploadData, std::string(buf3->data(), kUploadDataSize));
|
|
|
| // Finish reading the |EOF|.
|
| @@ -622,9 +620,8 @@ TEST_F(SpdyHttpStreamSpdy3Test, DelayedSendChunkedPostWithWindowUpdate) {
|
| data.RunFor(1);
|
| scoped_refptr<IOBuffer> buf1(new IOBuffer(kUploadDataSize));
|
| ASSERT_EQ(kUploadDataSize,
|
| - http_stream->ReadResponseBody(buf1,
|
| - kUploadDataSize,
|
| - callback.callback()));
|
| + http_stream->ReadResponseBody(
|
| + buf1.get(), kUploadDataSize, callback.callback()));
|
| EXPECT_EQ(kUploadData, std::string(buf1->data(), kUploadDataSize));
|
|
|
| // Finish reading the |EOF|.
|
| @@ -663,11 +660,11 @@ TEST_F(SpdyHttpStreamSpdy3Test, SpdyURLTest) {
|
| HttpResponseInfo response;
|
| HttpRequestHeaders headers;
|
| BoundNetLog net_log;
|
| - scoped_ptr<SpdyHttpStream> http_stream(new SpdyHttpStream(session_, true));
|
| - ASSERT_EQ(
|
| - OK,
|
| - http_stream->InitializeStream(&request, DEFAULT_PRIORITY,
|
| - net_log, CompletionCallback()));
|
| + scoped_ptr<SpdyHttpStream> http_stream(
|
| + new SpdyHttpStream(session_.get(), true));
|
| + ASSERT_EQ(OK,
|
| + http_stream->InitializeStream(
|
| + &request, DEFAULT_PRIORITY, net_log, CompletionCallback()));
|
|
|
| EXPECT_EQ(ERR_IO_PENDING, http_stream->SendRequest(headers, &response,
|
| callback.callback()));
|
|
|