| Index: net/disk_cache/blockfile/mapped_file_unittest.cc
|
| diff --git a/net/disk_cache/blockfile/mapped_file_unittest.cc b/net/disk_cache/blockfile/mapped_file_unittest.cc
|
| index 8b3a1d0f990227c27f6a16bde0141c3d73ceac75..5850876c43bfe8049e3dcfaf5c02cfcb8c2a941a 100644
|
| --- a/net/disk_cache/blockfile/mapped_file_unittest.cc
|
| +++ b/net/disk_cache/blockfile/mapped_file_unittest.cc
|
| @@ -14,13 +14,10 @@
|
| namespace {
|
|
|
| // Implementation of FileIOCallback for the tests.
|
| -class FileCallbackTest: public disk_cache::FileIOCallback {
|
| +class FileCallbackTest : public disk_cache::FileIOCallback {
|
| public:
|
| FileCallbackTest(int id, MessageLoopHelper* helper, int* max_id)
|
| - : id_(id),
|
| - helper_(helper),
|
| - max_id_(max_id) {
|
| - }
|
| + : id_(id), helper_(helper), max_id_(max_id) {}
|
| virtual ~FileCallbackTest() {}
|
|
|
| virtual void OnFileIOComplete(int bytes_copied) OVERRIDE;
|
| @@ -42,9 +39,7 @@ void FileCallbackTest::OnFileIOComplete(int bytes_copied) {
|
|
|
| class TestFileBlock : public disk_cache::FileBlock {
|
| public:
|
| - TestFileBlock() {
|
| - CacheTestFillBuffer(buffer_, sizeof(buffer_), false);
|
| - }
|
| + TestFileBlock() { CacheTestFillBuffer(buffer_, sizeof(buffer_), false); }
|
| virtual ~TestFileBlock() {}
|
|
|
| // FileBlock interface.
|
| @@ -88,15 +83,15 @@ TEST_F(DiskCacheTest, MappedFile_AsyncIO) {
|
| CacheTestFillBuffer(buffer1, sizeof(buffer1), false);
|
| base::strlcpy(buffer1, "the data", arraysize(buffer1));
|
| bool completed;
|
| - EXPECT_TRUE(file->Write(buffer1, sizeof(buffer1), 1024 * 1024, &callback,
|
| - &completed));
|
| + EXPECT_TRUE(file->Write(
|
| + buffer1, sizeof(buffer1), 1024 * 1024, &callback, &completed));
|
| int expected = completed ? 0 : 1;
|
|
|
| max_id = 1;
|
| helper.WaitUntilCacheIoFinished(expected);
|
|
|
| - EXPECT_TRUE(file->Read(buffer2, sizeof(buffer2), 1024 * 1024, &callback,
|
| - &completed));
|
| + EXPECT_TRUE(
|
| + file->Read(buffer2, sizeof(buffer2), 1024 * 1024, &callback, &completed));
|
| if (!completed)
|
| expected++;
|
|
|
| @@ -119,8 +114,8 @@ TEST_F(DiskCacheTest, MappedFile_AsyncLoadStore) {
|
|
|
| TestFileBlock file_block1;
|
| TestFileBlock file_block2;
|
| - base::strlcpy(static_cast<char*>(file_block1.buffer()), "the data",
|
| - file_block1.size());
|
| + base::strlcpy(
|
| + static_cast<char*>(file_block1.buffer()), "the data", file_block1.size());
|
| bool completed;
|
| EXPECT_TRUE(file->Store(&file_block1, &callback, &completed));
|
| int expected = completed ? 0 : 1;
|
|
|