summaryrefslogtreecommitdiffstats
path: root/net/disk_cache/disk_cache_perftest.cc
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 17:34:53 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 17:34:53 +0000
commitb8dd619aa87b909ca80c2684485b393e03db9dcc (patch)
treeee3326525c1e7d1926851d0cf9009291ad666bf8 /net/disk_cache/disk_cache_perftest.cc
parentd60c79650e1be14bb75b25362b2eadd0c76b48ba (diff)
downloadchromium_src-b8dd619aa87b909ca80c2684485b393e03db9dcc.zip
chromium_src-b8dd619aa87b909ca80c2684485b393e03db9dcc.tar.gz
chromium_src-b8dd619aa87b909ca80c2684485b393e03db9dcc.tar.bz2
Revert 70618 - 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/4067002 TBR=mmenke@chromium.org Review URL: http://codereview.chromium.org/6005015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/disk_cache_perftest.cc')
-rw-r--r--net/disk_cache/disk_cache_perftest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc
index 14f15c6..241fc04 100644
--- a/net/disk_cache/disk_cache_perftest.cc
+++ b/net/disk_cache/disk_cache_perftest.cc
@@ -169,7 +169,7 @@ TEST_F(DiskCacheTest, CacheBackendPerformance) {
disk_cache::Backend* cache;
int rv = disk_cache::CreateCacheBackend(
net::DISK_CACHE, test_cache.path(), 0, false,
- cache_thread.message_loop_proxy(), NULL, &cache, &cb);
+ cache_thread.message_loop_proxy(), &cache, &cb);
ASSERT_EQ(net::OK, cb.GetResult(rv));
@@ -198,7 +198,7 @@ TEST_F(DiskCacheTest, CacheBackendPerformance) {
rv = disk_cache::CreateCacheBackend(net::DISK_CACHE, test_cache.path(), 0,
false, cache_thread.message_loop_proxy(),
- NULL, &cache, &cb);
+ &cache, &cb);
ASSERT_EQ(net::OK, cb.GetResult(rv));
ret = TimeRead(num_entries, cache, entries, true);