Index: net/http/http_response_body_drainer_unittest.cc |
diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc |
index 188cffa65b9ef66191d15ef3d76796d31e0d78a0..6fcb3f4690fcee69574ad938c180bfb5a0713a82 100644 |
--- a/net/http/http_response_body_drainer_unittest.cc |
+++ b/net/http/http_response_body_drainer_unittest.cc |
@@ -197,7 +197,7 @@ int MockHttpStream::ReadResponseBodyImpl(IOBuffer* buf, int buf_len) { |
} |
void MockHttpStream::CompleteRead() { |
- int result = ReadResponseBodyImpl(user_buf_, buf_len_); |
+ int result = ReadResponseBodyImpl(user_buf_.get(), buf_len_); |
user_buf_ = NULL; |
CompletionCallback callback = callback_; |
callback_.Reset(); |
@@ -219,7 +219,7 @@ class HttpResponseBodyDrainerTest : public testing::Test { |
HttpNetworkSession* CreateNetworkSession() const { |
HttpNetworkSession::Params params; |
params.proxy_service = proxy_service_.get(); |
- params.ssl_config_service = ssl_config_service_; |
+ params.ssl_config_service = ssl_config_service_.get(); |
params.http_server_properties = http_server_properties_.get(); |
return new HttpNetworkSession(params); |
} |
@@ -236,20 +236,20 @@ class HttpResponseBodyDrainerTest : public testing::Test { |
TEST_F(HttpResponseBodyDrainerTest, DrainBodySyncSingleOK) { |
mock_stream_->set_num_chunks(1); |
mock_stream_->set_sync(); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
EXPECT_FALSE(result_waiter_.WaitForResult()); |
} |
TEST_F(HttpResponseBodyDrainerTest, DrainBodySyncOK) { |
mock_stream_->set_num_chunks(3); |
mock_stream_->set_sync(); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
EXPECT_FALSE(result_waiter_.WaitForResult()); |
} |
TEST_F(HttpResponseBodyDrainerTest, DrainBodyAsyncOK) { |
mock_stream_->set_num_chunks(3); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
EXPECT_FALSE(result_waiter_.WaitForResult()); |
} |
@@ -259,7 +259,7 @@ TEST_F(HttpResponseBodyDrainerTest, DrainBodyAsyncOK) { |
TEST_F(HttpResponseBodyDrainerTest, DrainBodyAsyncEmptyChunk) { |
mock_stream_->set_num_chunks(4); |
mock_stream_->set_is_last_chunk_zero_size(); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
EXPECT_FALSE(result_waiter_.WaitForResult()); |
} |
@@ -267,28 +267,28 @@ TEST_F(HttpResponseBodyDrainerTest, DrainBodySyncEmptyChunk) { |
mock_stream_->set_num_chunks(4); |
mock_stream_->set_sync(); |
mock_stream_->set_is_last_chunk_zero_size(); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
EXPECT_FALSE(result_waiter_.WaitForResult()); |
} |
TEST_F(HttpResponseBodyDrainerTest, DrainBodySizeEqualsDrainBuffer) { |
mock_stream_->set_num_chunks( |
HttpResponseBodyDrainer::kDrainBodyBufferSize / kMagicChunkSize); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
EXPECT_FALSE(result_waiter_.WaitForResult()); |
} |
TEST_F(HttpResponseBodyDrainerTest, DrainBodyTimeOut) { |
mock_stream_->set_num_chunks(2); |
mock_stream_->set_stall_reads_forever(); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
EXPECT_TRUE(result_waiter_.WaitForResult()); |
} |
TEST_F(HttpResponseBodyDrainerTest, CancelledBySession) { |
mock_stream_->set_num_chunks(2); |
mock_stream_->set_stall_reads_forever(); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
// HttpNetworkSession should delete |drainer_|. |
} |
@@ -298,7 +298,7 @@ TEST_F(HttpResponseBodyDrainerTest, DrainBodyTooLarge) { |
too_many_chunks += 1; // Now it's too large. |
mock_stream_->set_num_chunks(too_many_chunks); |
- drainer_->Start(session_); |
+ drainer_->Start(session_.get()); |
EXPECT_TRUE(result_waiter_.WaitForResult()); |
} |
@@ -308,13 +308,13 @@ TEST_F(HttpResponseBodyDrainerTest, StartBodyTooLarge) { |
too_many_chunks += 1; // Now it's too large. |
mock_stream_->set_num_chunks(0); |
- drainer_->StartWithSize(session_, too_many_chunks * kMagicChunkSize); |
+ drainer_->StartWithSize(session_.get(), too_many_chunks * kMagicChunkSize); |
EXPECT_TRUE(result_waiter_.WaitForResult()); |
} |
TEST_F(HttpResponseBodyDrainerTest, StartWithNothingToDo) { |
mock_stream_->set_num_chunks(0); |
- drainer_->StartWithSize(session_, 0); |
+ drainer_->StartWithSize(session_.get(), 0); |
EXPECT_FALSE(result_waiter_.WaitForResult()); |
} |