diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 20:04:37 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 20:04:37 +0000 |
| commit | 16359526ebc79731e7650f1e0d8fdbd400558ea1 (patch) | |
| tree | 700c204a8e994b0c3e42b4d88b48c248d1353b6e /net/tools/crash_cache | |
| parent | 915f251d0504a176e4a612a2b2ff2b00592a8819 (diff) | |
| download | chromium_src-16359526ebc79731e7650f1e0d8fdbd400558ea1.zip chromium_src-16359526ebc79731e7650f1e0d8fdbd400558ea1.tar.gz chromium_src-16359526ebc79731e7650f1e0d8fdbd400558ea1.tar.bz2 | |
Revert 114838 - base::Bind: Remove even moar OldCompletionCallback.
BUG=none
TEST=none
R=dpapad
Review URL: http://codereview.chromium.org/8947024
TBR=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/8966031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/crash_cache')
| -rw-r--r-- | net/tools/crash_cache/crash_cache.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc index a8f6cdc..9916dd6 100644 --- a/net/tools/crash_cache/crash_cache.cc +++ b/net/tools/crash_cache/crash_cache.cc @@ -265,9 +265,8 @@ int LoadOperations(const FilePath& path, RankCrashes action, // No experiments and use a simple LRU. cache->SetFlags(disk_cache::kNoRandom); - TestOldCompletionCallback old_cb; - net::TestCompletionCallback cb; - int rv = cache->Init(cb.callback()); + TestOldCompletionCallback cb; + int rv = cache->Init(&cb); if (cb.GetResult(rv) != net::OK || cache->GetEntryCount()) return GENERIC; @@ -277,14 +276,14 @@ int LoadOperations(const FilePath& path, RankCrashes action, disk_cache::Entry* entry; for (int i = 0; i < 100; i++) { std::string key = GenerateKey(true); - rv = cache->CreateEntry(key, &entry, &old_cb); - if (old_cb.GetResult(rv) != net::OK) + rv = cache->CreateEntry(key, &entry, &cb); + if (cb.GetResult(rv) != net::OK) return GENERIC; entry->Close(); FlushQueue(cache); if (50 == i && action >= disk_cache::REMOVE_LOAD_1) { - rv = cache->CreateEntry(kCrashEntryName, &entry, &old_cb); - if (old_cb.GetResult(rv) != net::OK) + rv = cache->CreateEntry(kCrashEntryName, &entry, &cb); + if (cb.GetResult(rv) != net::OK) return GENERIC; entry->Close(); FlushQueue(cache); @@ -294,13 +293,13 @@ int LoadOperations(const FilePath& path, RankCrashes action, if (action <= disk_cache::INSERT_LOAD_2) { disk_cache::g_rankings_crash = action; - rv = cache->CreateEntry(kCrashEntryName, &entry, &old_cb); - if (old_cb.GetResult(rv) != net::OK) + rv = cache->CreateEntry(kCrashEntryName, &entry, &cb); + if (cb.GetResult(rv) != net::OK) return GENERIC; } - rv = cache->OpenEntry(kCrashEntryName, &entry, &old_cb); - if (old_cb.GetResult(rv) != net::OK) + rv = cache->OpenEntry(kCrashEntryName, &entry, &cb); + if (cb.GetResult(rv) != net::OK) return GENERIC; disk_cache::g_rankings_crash = action; |