summaryrefslogtreecommitdiffstats
path: root/net/disk_cache/disk_cache_perftest.cc
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 17:52:40 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 17:52:40 +0000
commit6e3a23d8a7ffc9afc3488b3f9db0d498692a2e75 (patch)
tree0d51fc05132bd306f4b03091a32974ff4770cf98 /net/disk_cache/disk_cache_perftest.cc
parent26615ae54c78930ca83380df0c1320caba826193 (diff)
downloadchromium_src-6e3a23d8a7ffc9afc3488b3f9db0d498692a2e75.zip
chromium_src-6e3a23d8a7ffc9afc3488b3f9db0d498692a2e75.tar.gz
chromium_src-6e3a23d8a7ffc9afc3488b3f9db0d498692a2e75.tar.bz2
Disk cache: Fix back some style changes made recently.
No real code change. BUG=none TEST=none R=rsleevi@chromium.org Review URL: https://codereview.chromium.org/16916002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/disk_cache_perftest.cc')
-rw-r--r--net/disk_cache/disk_cache_perftest.cc53
1 files changed, 13 insertions, 40 deletions
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc
index 1d6bfd6..4aa7eca 100644
--- a/net/disk_cache/disk_cache_perftest.cc
+++ b/net/disk_cache/disk_cache_perftest.cc
@@ -67,24 +67,16 @@ bool TimeWrite(int num_entries, disk_cache::Backend* cache,
if (net::OK != cb.GetResult(rv))
break;
int ret = cache_entry->WriteData(
- 0,
- 0,
- buffer1.get(),
- kSize1,
- base::Bind(&CallbackTest::Run, base::Unretained(&callback)),
- false);
+ 0, 0, buffer1.get(), kSize1,
+ base::Bind(&CallbackTest::Run, base::Unretained(&callback)), false);
if (net::ERR_IO_PENDING == ret)
expected++;
else if (kSize1 != ret)
break;
ret = cache_entry->WriteData(
- 1,
- 0,
- buffer2.get(),
- entry.data_len,
- base::Bind(&CallbackTest::Run, base::Unretained(&callback)),
- false);
+ 1, 0, buffer2.get(), entry.data_len,
+ base::Bind(&CallbackTest::Run, base::Unretained(&callback)), false);
if (net::ERR_IO_PENDING == ret)
expected++;
else if (entry.data_len != ret)
@@ -124,10 +116,7 @@ bool TimeRead(int num_entries, disk_cache::Backend* cache,
if (net::OK != cb.GetResult(rv))
break;
int ret = cache_entry->ReadData(
- 0,
- 0,
- buffer1.get(),
- kSize1,
+ 0, 0, buffer1.get(), kSize1,
base::Bind(&CallbackTest::Run, base::Unretained(&callback)));
if (net::ERR_IO_PENDING == ret)
expected++;
@@ -135,10 +124,7 @@ bool TimeRead(int num_entries, disk_cache::Backend* cache,
break;
ret = cache_entry->ReadData(
- 1,
- 0,
- buffer2.get(),
- entries[i].data_len,
+ 1, 0, buffer2.get(), entries[i].data_len,
base::Bind(&CallbackTest::Run, base::Unretained(&callback)));
if (net::ERR_IO_PENDING == ret)
expected++;
@@ -175,21 +161,14 @@ TEST_F(DiskCacheTest, Hash) {
TEST_F(DiskCacheTest, CacheBackendPerformance) {
base::Thread cache_thread("CacheThread");
ASSERT_TRUE(cache_thread.StartWithOptions(
- base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
+ base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
ASSERT_TRUE(CleanupCacheDir());
net::TestCompletionCallback cb;
disk_cache::Backend* cache;
- int rv =
- disk_cache::CreateCacheBackend(net::DISK_CACHE,
- net::CACHE_BACKEND_BLOCKFILE,
- cache_path_,
- 0,
- false,
- cache_thread.message_loop_proxy().get(),
- NULL,
- &cache,
- cb.callback());
+ int rv = disk_cache::CreateCacheBackend(
+ net::DISK_CACHE, net::CACHE_BACKEND_BLOCKFILE, cache_path_, 0, false,
+ cache_thread.message_loop_proxy().get(), NULL, &cache, cb.callback());
ASSERT_EQ(net::OK, cb.GetResult(rv));
@@ -215,15 +194,9 @@ TEST_F(DiskCacheTest, CacheBackendPerformance) {
ASSERT_TRUE(file_util::EvictFileFromSystemCache(
cache_path_.AppendASCII("data_3")));
- rv = disk_cache::CreateCacheBackend(net::DISK_CACHE,
- net::CACHE_BACKEND_BLOCKFILE,
- cache_path_,
- 0,
- false,
- cache_thread.message_loop_proxy().get(),
- NULL,
- &cache,
- cb.callback());
+ rv = disk_cache::CreateCacheBackend(
+ net::DISK_CACHE, net::CACHE_BACKEND_BLOCKFILE, cache_path_, 0, false,
+ cache_thread.message_loop_proxy().get(), NULL, &cache, cb.callback());
ASSERT_EQ(net::OK, cb.GetResult(rv));
EXPECT_TRUE(TimeRead(num_entries, cache, entries, true));