Index: net/base/upload_file_element_reader_unittest.cc |
diff --git a/net/base/upload_file_element_reader_unittest.cc b/net/base/upload_file_element_reader_unittest.cc |
index 672ad54a07152ee8619bb8df43495025684efc2a..783175fdd95bd0d7a1cda3074e02cf75b036e3d0 100644 |
--- a/net/base/upload_file_element_reader_unittest.cc |
+++ b/net/base/upload_file_element_reader_unittest.cc |
@@ -53,15 +53,17 @@ TEST_F(UploadFileElementReaderTest, ReadPartially) { |
std::vector<char> buf(kHalfSize); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
TestCompletionCallback read_callback1; |
- ASSERT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer, buf.size(), |
- read_callback1.callback())); |
+ ASSERT_EQ(ERR_IO_PENDING, |
+ reader_->Read( |
+ wrapped_buffer.get(), buf.size(), read_callback1.callback())); |
EXPECT_EQ(static_cast<int>(buf.size()), read_callback1.WaitForResult()); |
EXPECT_EQ(bytes_.size() - buf.size(), reader_->BytesRemaining()); |
EXPECT_EQ(std::vector<char>(bytes_.begin(), bytes_.begin() + kHalfSize), buf); |
TestCompletionCallback read_callback2; |
- EXPECT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer, buf.size(), |
- read_callback2.callback())); |
+ EXPECT_EQ(ERR_IO_PENDING, |
+ reader_->Read( |
+ wrapped_buffer.get(), buf.size(), read_callback2.callback())); |
EXPECT_EQ(static_cast<int>(buf.size()), read_callback2.WaitForResult()); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
EXPECT_EQ(std::vector<char>(bytes_.begin() + kHalfSize, bytes_.end()), buf); |
@@ -71,14 +73,16 @@ TEST_F(UploadFileElementReaderTest, ReadAll) { |
std::vector<char> buf(bytes_.size()); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
TestCompletionCallback read_callback; |
- ASSERT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer, buf.size(), |
- read_callback.callback())); |
+ ASSERT_EQ(ERR_IO_PENDING, |
+ reader_->Read( |
+ wrapped_buffer.get(), buf.size(), read_callback.callback())); |
EXPECT_EQ(static_cast<int>(buf.size()), read_callback.WaitForResult()); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
EXPECT_EQ(bytes_, buf); |
// Try to read again. |
- EXPECT_EQ(0, reader_->Read(wrapped_buffer, buf.size(), |
- read_callback.callback())); |
+ EXPECT_EQ(0, |
+ reader_->Read( |
+ wrapped_buffer.get(), buf.size(), read_callback.callback())); |
} |
TEST_F(UploadFileElementReaderTest, ReadTooMuch) { |
@@ -86,8 +90,9 @@ TEST_F(UploadFileElementReaderTest, ReadTooMuch) { |
std::vector<char> buf(kTooLargeSize); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
TestCompletionCallback read_callback; |
- ASSERT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer, buf.size(), |
- read_callback.callback())); |
+ ASSERT_EQ(ERR_IO_PENDING, |
+ reader_->Read( |
+ wrapped_buffer.get(), buf.size(), read_callback.callback())); |
EXPECT_EQ(static_cast<int>(bytes_.size()), read_callback.WaitForResult()); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
buf.resize(bytes_.size()); // Resize to compare. |
@@ -100,8 +105,9 @@ TEST_F(UploadFileElementReaderTest, MultipleInit) { |
// Read all. |
TestCompletionCallback read_callback1; |
- ASSERT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer, buf.size(), |
- read_callback1.callback())); |
+ ASSERT_EQ(ERR_IO_PENDING, |
+ reader_->Read( |
+ wrapped_buffer.get(), buf.size(), read_callback1.callback())); |
EXPECT_EQ(static_cast<int>(buf.size()), read_callback1.WaitForResult()); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
EXPECT_EQ(bytes_, buf); |
@@ -115,8 +121,9 @@ TEST_F(UploadFileElementReaderTest, MultipleInit) { |
// Read again. |
TestCompletionCallback read_callback2; |
- ASSERT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer, buf.size(), |
- read_callback2.callback())); |
+ ASSERT_EQ(ERR_IO_PENDING, |
+ reader_->Read( |
+ wrapped_buffer.get(), buf.size(), read_callback2.callback())); |
EXPECT_EQ(static_cast<int>(buf.size()), read_callback2.WaitForResult()); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
EXPECT_EQ(bytes_, buf); |
@@ -128,8 +135,9 @@ TEST_F(UploadFileElementReaderTest, InitDuringAsyncOperation) { |
// Start reading all. |
TestCompletionCallback read_callback1; |
- EXPECT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer, buf.size(), |
- read_callback1.callback())); |
+ EXPECT_EQ(ERR_IO_PENDING, |
+ reader_->Read( |
+ wrapped_buffer.get(), buf.size(), read_callback1.callback())); |
// Call Init to cancel the previous read. |
TestCompletionCallback init_callback1; |
@@ -146,8 +154,9 @@ TEST_F(UploadFileElementReaderTest, InitDuringAsyncOperation) { |
std::vector<char> buf2(bytes_.size() / 2); |
scoped_refptr<IOBuffer> wrapped_buffer2 = new WrappedIOBuffer(&buf2[0]); |
TestCompletionCallback read_callback2; |
- EXPECT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer2, buf2.size(), |
- read_callback2.callback())); |
+ EXPECT_EQ(ERR_IO_PENDING, |
+ reader_->Read( |
+ wrapped_buffer2.get(), buf2.size(), read_callback2.callback())); |
EXPECT_EQ(static_cast<int>(buf2.size()), read_callback2.WaitForResult()); |
EXPECT_EQ(bytes_.size() - buf2.size(), reader_->BytesRemaining()); |
EXPECT_EQ(std::vector<char>(bytes_.begin(), bytes_.begin() + buf2.size()), |
@@ -172,8 +181,9 @@ TEST_F(UploadFileElementReaderTest, Range) { |
std::vector<char> buf(kLength); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
TestCompletionCallback read_callback; |
- ASSERT_EQ(ERR_IO_PENDING, reader_->Read(wrapped_buffer, kLength, |
- read_callback.callback())); |
+ ASSERT_EQ( |
+ ERR_IO_PENDING, |
+ reader_->Read(wrapped_buffer.get(), kLength, read_callback.callback())); |
EXPECT_EQ(static_cast<int>(kLength), read_callback.WaitForResult()); |
const std::vector<char> expected(bytes_.begin() + kOffset, |
bytes_.begin() + kOffset + kLength); |
@@ -242,13 +252,15 @@ TEST_F(UploadFileElementReaderSyncTest, ReadPartially) { |
ASSERT_EQ(bytes_.size(), kHalfSize * 2); |
std::vector<char> buf(kHalfSize); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
- EXPECT_EQ(static_cast<int>(buf.size()), |
- reader_->Read(wrapped_buffer, buf.size(), CompletionCallback())); |
+ EXPECT_EQ( |
+ static_cast<int>(buf.size()), |
+ reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback())); |
EXPECT_EQ(bytes_.size() - buf.size(), reader_->BytesRemaining()); |
EXPECT_EQ(std::vector<char>(bytes_.begin(), bytes_.begin() + kHalfSize), buf); |
- EXPECT_EQ(static_cast<int>(buf.size()), |
- reader_->Read(wrapped_buffer, buf.size(), CompletionCallback())); |
+ EXPECT_EQ( |
+ static_cast<int>(buf.size()), |
+ reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback())); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
EXPECT_EQ(std::vector<char>(bytes_.begin() + kHalfSize, bytes_.end()), buf); |
} |
@@ -256,20 +268,23 @@ TEST_F(UploadFileElementReaderSyncTest, ReadPartially) { |
TEST_F(UploadFileElementReaderSyncTest, ReadAll) { |
std::vector<char> buf(bytes_.size()); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
- EXPECT_EQ(static_cast<int>(buf.size()), |
- reader_->Read(wrapped_buffer, buf.size(), CompletionCallback())); |
+ EXPECT_EQ( |
+ static_cast<int>(buf.size()), |
+ reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback())); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
EXPECT_EQ(bytes_, buf); |
// Try to read again. |
- EXPECT_EQ(0, reader_->Read(wrapped_buffer, buf.size(), CompletionCallback())); |
+ EXPECT_EQ( |
+ 0, reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback())); |
} |
TEST_F(UploadFileElementReaderSyncTest, ReadTooMuch) { |
const size_t kTooLargeSize = bytes_.size() * 2; |
std::vector<char> buf(kTooLargeSize); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
- EXPECT_EQ(static_cast<int>(bytes_.size()), |
- reader_->Read(wrapped_buffer, buf.size(), CompletionCallback())); |
+ EXPECT_EQ( |
+ static_cast<int>(bytes_.size()), |
+ reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback())); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
buf.resize(bytes_.size()); // Resize to compare. |
EXPECT_EQ(bytes_, buf); |
@@ -280,8 +295,9 @@ TEST_F(UploadFileElementReaderSyncTest, MultipleInit) { |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
// Read all. |
- EXPECT_EQ(static_cast<int>(buf.size()), |
- reader_->Read(wrapped_buffer, buf.size(), CompletionCallback())); |
+ EXPECT_EQ( |
+ static_cast<int>(buf.size()), |
+ reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback())); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
EXPECT_EQ(bytes_, buf); |
@@ -291,8 +307,9 @@ TEST_F(UploadFileElementReaderSyncTest, MultipleInit) { |
EXPECT_EQ(bytes_.size(), reader_->BytesRemaining()); |
// Read again. |
- EXPECT_EQ(static_cast<int>(buf.size()), |
- reader_->Read(wrapped_buffer, buf.size(), CompletionCallback())); |
+ EXPECT_EQ( |
+ static_cast<int>(buf.size()), |
+ reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback())); |
EXPECT_EQ(0U, reader_->BytesRemaining()); |
EXPECT_EQ(bytes_, buf); |
} |
@@ -308,7 +325,7 @@ TEST_F(UploadFileElementReaderSyncTest, Range) { |
std::vector<char> buf(kLength); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
EXPECT_EQ(static_cast<int>(kLength), |
- reader_->Read(wrapped_buffer, kLength, CompletionCallback())); |
+ reader_->Read(wrapped_buffer.get(), kLength, CompletionCallback())); |
const std::vector<char> expected(bytes_.begin() + kOffset, |
bytes_.begin() + kOffset + kLength); |
EXPECT_EQ(expected, buf); |