| Index: net/base/file_stream_unittest.cc
|
| diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
|
| index 883421b728e666ca723e028fa778d5345ddae582..29fd14ffcf3ab616a750a21ff6ad7364b4bedf99 100644
|
| --- a/net/base/file_stream_unittest.cc
|
| +++ b/net/base/file_stream_unittest.cc
|
| @@ -72,9 +72,8 @@ namespace {
|
| TEST_F(FileStreamTest, OpenExplicitClose) {
|
| TestCompletionCallback callback;
|
| FileStream stream(base::MessageLoopProxy::current());
|
| - int flags = base::File::FLAG_OPEN |
|
| - base::File::FLAG_READ |
|
| - base::File::FLAG_ASYNC;
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
|
| int rv = stream.Open(temp_file_path(), flags, callback.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| EXPECT_EQ(OK, callback.WaitForResult());
|
| @@ -88,10 +87,10 @@ TEST_F(FileStreamTest, OpenExplicitClose) {
|
|
|
| TEST_F(FileStreamTest, OpenExplicitCloseOrphaned) {
|
| TestCompletionCallback callback;
|
| - scoped_ptr<FileStream> stream(new FileStream(
|
| - base::MessageLoopProxy::current()));
|
| - int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
|
| - base::File::FLAG_ASYNC;
|
| + scoped_ptr<FileStream> stream(
|
| + new FileStream(base::MessageLoopProxy::current()));
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
|
| int rv = stream->Open(temp_file_path(), flags, callback.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| EXPECT_EQ(OK, callback.WaitForResult());
|
| @@ -120,9 +119,9 @@ TEST_F(FileStreamTest, UseFileHandle) {
|
| // Seek to the beginning of the file and read.
|
| scoped_ptr<FileStream> read_stream(
|
| new FileStream(file.Pass(), base::MessageLoopProxy::current()));
|
| - ASSERT_EQ(ERR_IO_PENDING,
|
| - read_stream->Seek(base::File::FROM_BEGIN, 0,
|
| - callback64.callback()));
|
| + ASSERT_EQ(
|
| + ERR_IO_PENDING,
|
| + read_stream->Seek(base::File::FROM_BEGIN, 0, callback64.callback()));
|
| ASSERT_EQ(0, callback64.WaitForResult());
|
| // Read into buffer and compare.
|
| scoped_refptr<IOBufferWithSize> read_buffer =
|
| @@ -140,20 +139,20 @@ TEST_F(FileStreamTest, UseFileHandle) {
|
|
|
| scoped_ptr<FileStream> write_stream(
|
| new FileStream(file.Pass(), base::MessageLoopProxy::current()));
|
| - ASSERT_EQ(ERR_IO_PENDING,
|
| - write_stream->Seek(base::File::FROM_BEGIN, 0,
|
| - callback64.callback()));
|
| + ASSERT_EQ(
|
| + ERR_IO_PENDING,
|
| + write_stream->Seek(base::File::FROM_BEGIN, 0, callback64.callback()));
|
| ASSERT_EQ(0, callback64.WaitForResult());
|
| scoped_refptr<IOBufferWithSize> write_buffer = CreateTestDataBuffer();
|
| - rv = write_stream->Write(write_buffer.get(), kTestDataSize,
|
| - callback.callback());
|
| + rv = write_stream->Write(
|
| + write_buffer.get(), kTestDataSize, callback.callback());
|
| ASSERT_EQ(kTestDataSize, callback.GetResult(rv));
|
| write_stream.reset();
|
|
|
| // Read into buffer and compare to make sure the handle worked fine.
|
| - ASSERT_EQ(kTestDataSize,
|
| - base::ReadFile(temp_file_path(), read_buffer->data(),
|
| - kTestDataSize));
|
| + ASSERT_EQ(
|
| + kTestDataSize,
|
| + base::ReadFile(temp_file_path(), read_buffer->data(), kTestDataSize));
|
| ASSERT_EQ(0, memcmp(kTestData, read_buffer->data(), kTestDataSize));
|
| }
|
|
|
| @@ -181,8 +180,8 @@ TEST_F(FileStreamTest, Read) {
|
| EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
|
|
|
| FileStream stream(base::MessageLoopProxy::current());
|
| - int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
|
| - base::File::FLAG_ASYNC;
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
|
| TestCompletionCallback callback;
|
| int rv = stream.Open(temp_file_path(), flags, callback.callback());
|
| EXPECT_EQ(OK, callback.GetResult(rv));
|
| @@ -210,8 +209,8 @@ TEST_F(FileStreamTest, Read_EarlyDelete) {
|
|
|
| scoped_ptr<FileStream> stream(
|
| new FileStream(base::MessageLoopProxy::current()));
|
| - int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
|
| - base::File::FLAG_ASYNC;
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
|
| TestCompletionCallback callback;
|
| int rv = stream->Open(temp_file_path(), flags, callback.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| @@ -235,8 +234,8 @@ TEST_F(FileStreamTest, Read_FromOffset) {
|
| EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
|
|
|
| FileStream stream(base::MessageLoopProxy::current());
|
| - int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
|
| - base::File::FLAG_ASYNC;
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
|
| TestCompletionCallback callback;
|
| int rv = stream.Open(temp_file_path(), flags, callback.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| @@ -269,8 +268,8 @@ TEST_F(FileStreamTest, Read_FromOffset) {
|
|
|
| TEST_F(FileStreamTest, SeekAround) {
|
| FileStream stream(base::MessageLoopProxy::current());
|
| - int flags = base::File::FLAG_OPEN | base::File::FLAG_ASYNC |
|
| - base::File::FLAG_READ;
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_ASYNC | base::File::FLAG_READ;
|
| TestCompletionCallback callback;
|
| int rv = stream.Open(temp_file_path(), flags, callback.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| @@ -360,8 +359,8 @@ TEST_F(FileStreamTest, Write_FromOffset) {
|
| EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
|
|
|
| FileStream stream(base::MessageLoopProxy::current());
|
| - int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
|
| - base::File::FLAG_ASYNC;
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
|
| TestCompletionCallback callback;
|
| int rv = stream.Open(temp_file_path(), flags, callback.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| @@ -380,8 +379,8 @@ TEST_F(FileStreamTest, Write_FromOffset) {
|
| scoped_refptr<DrainableIOBuffer> drainable =
|
| new DrainableIOBuffer(buf.get(), buf->size());
|
| while (total_bytes_written != kTestDataSize) {
|
| - rv = stream.Write(drainable.get(), drainable->BytesRemaining(),
|
| - callback.callback());
|
| + rv = stream.Write(
|
| + drainable.get(), drainable->BytesRemaining(), callback.callback());
|
| if (rv == ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| EXPECT_LT(0, rv);
|
| @@ -430,8 +429,8 @@ TEST_F(FileStreamTest, BasicReadWrite) {
|
| scoped_refptr<DrainableIOBuffer> drainable =
|
| new DrainableIOBuffer(buf.get(), buf->size());
|
| while (total_bytes_written != kTestDataSize) {
|
| - rv = stream->Write(drainable.get(), drainable->BytesRemaining(),
|
| - callback.callback());
|
| + rv = stream->Write(
|
| + drainable.get(), drainable->BytesRemaining(), callback.callback());
|
| if (rv == ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| EXPECT_LT(0, rv);
|
| @@ -472,8 +471,8 @@ TEST_F(FileStreamTest, BasicWriteRead) {
|
| scoped_refptr<DrainableIOBuffer> drainable =
|
| new DrainableIOBuffer(buf.get(), buf->size());
|
| while (total_bytes_written != kTestDataSize) {
|
| - rv = stream->Write(drainable.get(), drainable->BytesRemaining(),
|
| - callback.callback());
|
| + rv = stream->Write(
|
| + drainable.get(), drainable->BytesRemaining(), callback.callback());
|
| if (rv == ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| EXPECT_LT(0, rv);
|
| @@ -569,9 +568,9 @@ class TestWriteReadCompletionCallback {
|
| *data_read_ += data_read;
|
| } else { // We're done writing all data. Start reading the data.
|
| TestInt64CompletionCallback callback64;
|
| - EXPECT_EQ(ERR_IO_PENDING,
|
| - stream_->Seek(base::File::FROM_BEGIN, 0,
|
| - callback64.callback()));
|
| + EXPECT_EQ(
|
| + ERR_IO_PENDING,
|
| + stream_->Seek(base::File::FROM_BEGIN, 0, callback64.callback()));
|
| {
|
| base::MessageLoop::ScopedNestableTaskAllower allow(
|
| base::MessageLoop::current());
|
| @@ -636,8 +635,8 @@ TEST_F(FileStreamTest, WriteRead) {
|
| int total_bytes_written = 0;
|
| int total_bytes_read = 0;
|
| std::string data_read;
|
| - TestWriteReadCompletionCallback callback(stream.get(), &total_bytes_written,
|
| - &total_bytes_read, &data_read);
|
| + TestWriteReadCompletionCallback callback(
|
| + stream.get(), &total_bytes_written, &total_bytes_read, &data_read);
|
|
|
| scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
|
| rv = stream->Write(buf.get(), buf->size(), callback.callback());
|
| @@ -760,8 +759,8 @@ TEST_F(FileStreamTest, OpenAndDelete) {
|
|
|
| bool prev = base::ThreadRestrictions::SetIOAllowed(false);
|
| scoped_ptr<FileStream> stream(new FileStream(pool.get()));
|
| - int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
|
| - base::File::FLAG_ASYNC;
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
|
| TestCompletionCallback open_callback;
|
| int rv = stream->Open(temp_file_path(), flags, open_callback.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| @@ -788,14 +787,14 @@ TEST_F(FileStreamTest, OpenAndDelete) {
|
| // Verify that Write() errors are mapped correctly.
|
| TEST_F(FileStreamTest, WriteError) {
|
| // Try opening file as read-only and then writing to it using FileStream.
|
| - uint32 flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
|
| - base::File::FLAG_ASYNC;
|
| + uint32 flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
|
|
|
| base::File file(temp_file_path(), flags);
|
| ASSERT_TRUE(file.IsValid());
|
|
|
| scoped_ptr<FileStream> stream(
|
| - new FileStream(file.Pass(), base::MessageLoopProxy::current()));
|
| + new FileStream(file.Pass(), base::MessageLoopProxy::current()));
|
|
|
| scoped_refptr<IOBuffer> buf = new IOBuffer(1);
|
| buf->data()[0] = 0;
|
| @@ -813,14 +812,14 @@ TEST_F(FileStreamTest, WriteError) {
|
| // Verify that Read() errors are mapped correctly.
|
| TEST_F(FileStreamTest, ReadError) {
|
| // Try opening file for write and then reading from it using FileStream.
|
| - uint32 flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
|
| - base::File::FLAG_ASYNC;
|
| + uint32 flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
|
|
|
| base::File file(temp_file_path(), flags);
|
| ASSERT_TRUE(file.IsValid());
|
|
|
| scoped_ptr<FileStream> stream(
|
| - new FileStream(file.Pass(), base::MessageLoopProxy::current()));
|
| + new FileStream(file.Pass(), base::MessageLoopProxy::current()));
|
|
|
| scoped_refptr<IOBuffer> buf = new IOBuffer(1);
|
| TestCompletionCallback callback;
|
| @@ -853,8 +852,8 @@ TEST_F(FileStreamTest, ContentUriRead) {
|
| EXPECT_LT(0, file_size);
|
|
|
| FileStream stream(base::MessageLoopProxy::current());
|
| - int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
|
| - base::File::FLAG_ASYNC;
|
| + int flags =
|
| + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
|
| TestCompletionCallback callback;
|
| int rv = stream.Open(path, flags, callback.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
|
|