diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 03:04:54 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 03:04:54 +0000 |
| commit | f6f1bebcd33c1a9f3e6fcd6d1cae8d67fcfad4e9 (patch) | |
| tree | 28dff63e8eef81127a8d2d0e14ee4032f69cc9d5 /net/disk_cache/disk_cache_test_base.cc | |
| parent | a1d275af4275175d36664271f187a0512685cb49 (diff) | |
| download | chromium_src-f6f1bebcd33c1a9f3e6fcd6d1cae8d67fcfad4e9.zip chromium_src-f6f1bebcd33c1a9f3e6fcd6d1cae8d67fcfad4e9.tar.gz chromium_src-f6f1bebcd33c1a9f3e6fcd6d1cae8d67fcfad4e9.tar.bz2 | |
reapply r70628. It was wrongly blamed for breaking Linux valgrind bots.
The revert was r70688.
original author: Matt Menke
First pass at adding http/backend cache events to the NetLog.
Adds sources and events for ActiveCacheEntry and EntryImpl
objects, as well as adding cache read/write events to
HttpCacheTransactions. Most new read/write events are
only logged when NetLog logging mode is set to log all events.
Also, net-internals now merges begin and end events that have
parameters, as long as only one of them has parameters.
I think this increases readability, at the cost of making
it a little more difficult to follow timings with just the "st"
values.
BUG=59382
TEST=none yet, other than updates to existing tests.
Review URL: http://codereview.chromium.org/6150002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/disk_cache_test_base.cc')
| -rw-r--r-- | net/disk_cache/disk_cache_test_base.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc index cffe3fa..6c9b91c 100644 --- a/net/disk_cache/disk_cache_test_base.cc +++ b/net/disk_cache/disk_cache_test_base.cc @@ -75,7 +75,7 @@ void DiskCacheTestWithCache::InitDiskCache() { TestCompletionCallback cb; int rv = disk_cache::BackendImpl::CreateBackend( path, force_creation_, size_, type_, - disk_cache::kNoRandom, thread, &cache_, &cb); + disk_cache::kNoRandom, thread, NULL, &cache_, &cb); ASSERT_EQ(net::OK, cb.GetResult(rv)); } @@ -84,9 +84,9 @@ void DiskCacheTestWithCache::InitDiskCacheImpl(const FilePath& path) { use_current_thread_ ? base::MessageLoopProxy::CreateForCurrentThread() : cache_thread_.message_loop_proxy(); if (mask_) - cache_impl_ = new disk_cache::BackendImpl(path, mask_, thread); + cache_impl_ = new disk_cache::BackendImpl(path, mask_, thread, NULL); else - cache_impl_ = new disk_cache::BackendImpl(path, thread); + cache_impl_ = new disk_cache::BackendImpl(path, thread, NULL); cache_ = cache_impl_; ASSERT_TRUE(NULL != cache_); |