diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-17 02:20:23 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-17 02:20:23 +0000 |
| commit | 42c459638320b53e684fcebd60b6eca45f2cdea4 (patch) | |
| tree | a05eb30440e2156175d89ce731098d0d4d4dc32b /net/tools | |
| parent | 4189b0de2312dc216ce2938a88b794c1987fe2eb (diff) | |
| download | chromium_src-42c459638320b53e684fcebd60b6eca45f2cdea4.zip chromium_src-42c459638320b53e684fcebd60b6eca45f2cdea4.tar.gz chromium_src-42c459638320b53e684fcebd60b6eca45f2cdea4.tar.bz2 | |
Reland after fixes.
base::Bind: Remove even moar OldCompletionCallback.
BUG=none
TEST=none
R=dpapad
Review URL: http://codereview.chromium.org/8947024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/crash_cache/crash_cache.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc index 9916dd6..a8f6cdc 100644 --- a/net/tools/crash_cache/crash_cache.cc +++ b/net/tools/crash_cache/crash_cache.cc @@ -265,8 +265,9 @@ int LoadOperations(const FilePath& path, RankCrashes action, // No experiments and use a simple LRU. cache->SetFlags(disk_cache::kNoRandom); - TestOldCompletionCallback cb; - int rv = cache->Init(&cb); + TestOldCompletionCallback old_cb; + net::TestCompletionCallback cb; + int rv = cache->Init(cb.callback()); if (cb.GetResult(rv) != net::OK || cache->GetEntryCount()) return GENERIC; @@ -276,14 +277,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, &cb); - if (cb.GetResult(rv) != net::OK) + rv = cache->CreateEntry(key, &entry, &old_cb); + if (old_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, &cb); - if (cb.GetResult(rv) != net::OK) + rv = cache->CreateEntry(kCrashEntryName, &entry, &old_cb); + if (old_cb.GetResult(rv) != net::OK) return GENERIC; entry->Close(); FlushQueue(cache); @@ -293,13 +294,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, &cb); - if (cb.GetResult(rv) != net::OK) + rv = cache->CreateEntry(kCrashEntryName, &entry, &old_cb); + if (old_cb.GetResult(rv) != net::OK) return GENERIC; } - rv = cache->OpenEntry(kCrashEntryName, &entry, &cb); - if (cb.GetResult(rv) != net::OK) + rv = cache->OpenEntry(kCrashEntryName, &entry, &old_cb); + if (old_cb.GetResult(rv) != net::OK) return GENERIC; disk_cache::g_rankings_crash = action; |