From ddb351dbec246cf1fab5ec20d2d5520909041de1 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Tue, 28 Jun 2011 21:49:31 +0100
Subject: Merge Chromium at r12.0.742.93: Initial merge by git

Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
---
 net/disk_cache/disk_cache_test_base.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'net/disk_cache/disk_cache_test_base.cc')

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_);
 
-- 
cgit v1.2.3