diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-28 21:49:31 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:00 +0100 |
| commit | ddb351dbec246cf1fab5ec20d2d5520909041de1 (patch) | |
| tree | 158e3fb57bdcac07c7f1e767fde3c70687c9fbb1 /net/disk_cache/disk_cache_test_base.cc | |
| parent | 6b92e04f5f151c896e3088e86f70db7081009308 (diff) | |
| download | chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.gz | |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
Diffstat (limited to 'net/disk_cache/disk_cache_test_base.cc')
| -rw-r--r-- | net/disk_cache/disk_cache_test_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc index 41d1caf5..bbcb65d8 100644 --- a/net/disk_cache/disk_cache_test_base.cc +++ b/net/disk_cache/disk_cache_test_base.cc @@ -221,11 +221,11 @@ void DiskCacheTestWithCache::TearDown() { void DiskCacheTestWithCache::InitMemoryCache() { if (!implementation_) { - cache_ = disk_cache::MemBackendImpl::CreateBackend(size_); + cache_ = disk_cache::MemBackendImpl::CreateBackend(size_, NULL); return; } - mem_cache_ = new disk_cache::MemBackendImpl(); + mem_cache_ = new disk_cache::MemBackendImpl(NULL); cache_ = mem_cache_; ASSERT_TRUE(NULL != cache_); |