| Index: net/disk_cache/disk_cache_test_base.cc
|
| diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc
|
| index 045765dd448778dd09bbd27e73ac1a7f74bfae27..86ddb1ede5efee7c15d194cb927024007176908e 100644
|
| --- a/net/disk_cache/disk_cache_test_base.cc
|
| +++ b/net/disk_cache/disk_cache_test_base.cc
|
| @@ -68,7 +68,8 @@ DiskCacheTestWithCache::DiskCacheTestWithCache()
|
| cache_thread_("CacheThread") {
|
| }
|
|
|
| -DiskCacheTestWithCache::~DiskCacheTestWithCache() {}
|
| +DiskCacheTestWithCache::~DiskCacheTestWithCache() {
|
| +}
|
|
|
| void DiskCacheTestWithCache::InitCache() {
|
| if (memory_only_)
|
| @@ -178,15 +179,21 @@ void DiskCacheTestWithCache::RunTaskForTest(const base::Closure& closure) {
|
| EXPECT_EQ(net::OK, cb.GetResult(rv));
|
| }
|
|
|
| -int DiskCacheTestWithCache::ReadData(disk_cache::Entry* entry, int index,
|
| - int offset, net::IOBuffer* buf, int len) {
|
| +int DiskCacheTestWithCache::ReadData(disk_cache::Entry* entry,
|
| + int index,
|
| + int offset,
|
| + net::IOBuffer* buf,
|
| + int len) {
|
| net::TestCompletionCallback cb;
|
| int rv = entry->ReadData(index, offset, buf, len, cb.callback());
|
| return cb.GetResult(rv);
|
| }
|
|
|
| -int DiskCacheTestWithCache::WriteData(disk_cache::Entry* entry, int index,
|
| - int offset, net::IOBuffer* buf, int len,
|
| +int DiskCacheTestWithCache::WriteData(disk_cache::Entry* entry,
|
| + int index,
|
| + int offset,
|
| + net::IOBuffer* buf,
|
| + int len,
|
| bool truncate) {
|
| net::TestCompletionCallback cb;
|
| int rv = entry->WriteData(index, offset, buf, len, cb.callback(), truncate);
|
| @@ -194,7 +201,8 @@ int DiskCacheTestWithCache::WriteData(disk_cache::Entry* entry, int index,
|
| }
|
|
|
| int DiskCacheTestWithCache::ReadSparseData(disk_cache::Entry* entry,
|
| - int64 offset, net::IOBuffer* buf,
|
| + int64 offset,
|
| + net::IOBuffer* buf,
|
| int len) {
|
| net::TestCompletionCallback cb;
|
| int rv = entry->ReadSparseData(offset, buf, len, cb.callback());
|
| @@ -203,7 +211,8 @@ int DiskCacheTestWithCache::ReadSparseData(disk_cache::Entry* entry,
|
|
|
| int DiskCacheTestWithCache::WriteSparseData(disk_cache::Entry* entry,
|
| int64 offset,
|
| - net::IOBuffer* buf, int len) {
|
| + net::IOBuffer* buf,
|
| + int len) {
|
| net::TestCompletionCallback cb;
|
| int rv = entry->WriteSparseData(offset, buf, len, cb.callback());
|
| return cb.GetResult(rv);
|
| @@ -229,8 +238,8 @@ void DiskCacheTestWithCache::AddDelay() {
|
| const base::Time initial_time = base::Time::Now();
|
| do {
|
| base::PlatformThread::YieldCurrentThread();
|
| - } while (base::Time::Now() -
|
| - initial_time < base::TimeDelta::FromSeconds(1));
|
| + } while (base::Time::Now() - initial_time <
|
| + base::TimeDelta::FromSeconds(1));
|
| }
|
|
|
| base::Time initial = base::Time::Now();
|
|
|