| Index: net/base/file_stream_unittest.cc
|
| diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
|
| index 292b0d207cfff37320e34e72fc53e25725302437..3d6bd962a3a9d32d0952c815ca7e11544a876120 100644
|
| --- a/net/base/file_stream_unittest.cc
|
| +++ b/net/base/file_stream_unittest.cc
|
| @@ -71,9 +71,8 @@ namespace {
|
| TEST_F(FileStreamTest, AsyncOpenExplicitClose) {
|
| 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());
|
| @@ -87,10 +86,10 @@ TEST_F(FileStreamTest, AsyncOpenExplicitClose) {
|
|
|
| TEST_F(FileStreamTest, AsyncOpenExplicitCloseOrphaned) {
|
| 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());
|
| @@ -142,15 +141,15 @@ TEST_F(FileStreamTest, UseFileHandle) {
|
| write_stream->Seek(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));
|
| }
|
|
|
| @@ -178,8 +177,8 @@ TEST_F(FileStreamTest, AsyncRead) {
|
| 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);
|
| @@ -209,8 +208,8 @@ TEST_F(FileStreamTest, AsyncRead_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);
|
| @@ -234,8 +233,8 @@ TEST_F(FileStreamTest, AsyncRead_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);
|
| @@ -268,8 +267,8 @@ TEST_F(FileStreamTest, AsyncRead_FromOffset) {
|
|
|
| TEST_F(FileStreamTest, AsyncSeekAround) {
|
| 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);
|
| @@ -320,8 +319,8 @@ TEST_F(FileStreamTest, AsyncWrite) {
|
| 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);
|
| @@ -367,8 +366,8 @@ TEST_F(FileStreamTest, AsyncWrite_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);
|
| @@ -387,8 +386,8 @@ TEST_F(FileStreamTest, AsyncWrite_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);
|
| @@ -437,8 +436,8 @@ TEST_F(FileStreamTest, BasicAsyncReadWrite) {
|
| 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);
|
| @@ -479,8 +478,8 @@ TEST_F(FileStreamTest, BasicAsyncWriteRead) {
|
| 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);
|
| @@ -641,8 +640,8 @@ TEST_F(FileStreamTest, AsyncWriteRead) {
|
| 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());
|
| @@ -764,8 +763,8 @@ TEST_F(FileStreamTest, AsyncOpenAndDelete) {
|
|
|
| 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);
|
| @@ -792,14 +791,14 @@ TEST_F(FileStreamTest, AsyncOpenAndDelete) {
|
| // Verify that async Write() errors are mapped correctly.
|
| TEST_F(FileStreamTest, AsyncWriteError) {
|
| // 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;
|
| @@ -817,14 +816,14 @@ TEST_F(FileStreamTest, AsyncWriteError) {
|
| // Verify that async Read() errors are mapped correctly.
|
| TEST_F(FileStreamTest, AsyncReadError) {
|
| // 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;
|
| @@ -857,8 +856,8 @@ TEST_F(FileStreamTest, ContentUriAsyncRead) {
|
| 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);
|
|
|