Index: net/http/http_stream_parser_unittest.cc |
diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc |
index 9ef3cc7c26e8e71556b2697dbd740530d0eefde3..4f30b73162b006b74a1bbed0995e03544a2d9d54 100644 |
--- a/net/http/http_stream_parser_unittest.cc |
+++ b/net/http/http_stream_parser_unittest.cc |
@@ -96,7 +96,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_NoBody) { |
TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_EmptyBody) { |
scoped_refptr<UploadData> upload_data = new UploadData; |
- scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); |
+ scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data.get())); |
ASSERT_EQ(OK, body->InitSync()); |
// Shouldn't be merged if upload data is empty. |
ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( |
@@ -109,7 +109,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_ChunkedBody) { |
const std::string payload = "123"; |
upload_data->AppendChunk(payload.data(), payload.size(), true); |
- scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); |
+ scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data.get())); |
ASSERT_EQ(OK, body->InitSync()); |
// Shouldn't be merged if upload data carries chunked data. |
ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( |
@@ -128,7 +128,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_FileBody) { |
upload_data->AppendFileRange(temp_file_path, 0, 0, base::Time()); |
- scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); |
+ scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data.get())); |
ASSERT_EQ(OK, body->InitSync()); |
// Shouldn't be merged if upload data carries a file, as it's not in-memory. |
ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( |
@@ -140,7 +140,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_SmallBodyInMemory) { |
const std::string payload = "123"; |
upload_data->AppendBytes(payload.data(), payload.size()); |
- scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); |
+ scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data.get())); |
ASSERT_EQ(OK, body->InitSync()); |
// Yes, should be merged if the in-memory body is small here. |
ASSERT_TRUE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( |
@@ -152,7 +152,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_LargeBodyInMemory) { |
const std::string payload(10000, 'a'); // 'a' x 10000. |
upload_data->AppendBytes(payload.data(), payload.size()); |
- scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); |
+ scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data.get())); |
ASSERT_EQ(OK, body->InitSync()); |
// Shouldn't be merged if the in-memory body is large here. |
ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( |
@@ -216,7 +216,7 @@ TEST(HttpStreamParser, AsyncChunkAndAsyncSocket) { |
request_info.load_flags = LOAD_NORMAL; |
scoped_refptr<GrowableIOBuffer> read_buffer(new GrowableIOBuffer); |
- HttpStreamParser parser(socket_handle.get(), &request_info, read_buffer, |
+ HttpStreamParser parser(socket_handle.get(), &request_info, read_buffer.get(), |
BoundNetLog()); |
scoped_refptr<UploadData> upload_data(new UploadData); |
@@ -225,7 +225,7 @@ TEST(HttpStreamParser, AsyncChunkAndAsyncSocket) { |
upload_data->AppendChunk(kChunk1, arraysize(kChunk1) - 1, false); |
scoped_ptr<UploadDataStream> upload_stream( |
- new UploadDataStream(upload_data)); |
+ new UploadDataStream(upload_data.get())); |
ASSERT_EQ(OK, upload_stream->InitSync()); |
HttpRequestHeaders request_headers; |
@@ -293,7 +293,9 @@ TEST(HttpStreamParser, AsyncChunkAndAsyncSocket) { |
// Finally, attempt to read the response body. |
scoped_refptr<IOBuffer> body_buffer(new IOBuffer(kBodySize)); |
- rv = parser.ReadResponseBody(body_buffer, kBodySize, callback.callback()); |
+ rv = |
+ parser.ReadResponseBody( |
+ body_buffer.get(), kBodySize, callback.callback()); |
ASSERT_EQ(ERR_IO_PENDING, rv); |
data.RunFor(1); |