Revert 60165 - GTTF: Make net_unittests run successfully with parallel test l...

net/disk_cache/disk_cache_test_base.cc

Index: net/disk_cache/disk_cache_test_base.cc
===================================================================
--- net/disk_cache/disk_cache_test_base.cc	(revision 60165)
+++ net/disk_cache/disk_cache_test_base.cc	(working copy)
@@ -55,8 +55,9 @@
 }
 
 void DiskCacheTestWithCache::InitDiskCache() {
+  FilePath path = GetCacheFilePath();
   if (first_cleanup_)
-    ASSERT_TRUE(DeleteCache(test_cache_.path()));
+    ASSERT_TRUE(DeleteCache(path));
 
   if (!cache_thread_.IsRunning()) {
     EXPECT_TRUE(cache_thread_.StartWithOptions(
@@ -65,7 +66,7 @@
   ASSERT_TRUE(cache_thread_.message_loop() != NULL);
 
   if (implementation_)
-    return InitDiskCacheImpl(test_cache_.path());
+    return InitDiskCacheImpl(path);
 
   scoped_refptr<base::MessageLoopProxy> thread =
       use_current_thread_ ? base::MessageLoopProxy::CreateForCurrentThread() :
@@ -73,8 +74,8 @@
 
   TestCompletionCallback cb;
   int rv = disk_cache::BackendImpl::CreateBackend(
-      test_cache_.path(), force_creation_, size_, type_,
-      disk_cache::kNoRandom, thread, &cache_, &cb);
+               path, force_creation_, size_, type_,
+               disk_cache::kNoRandom, thread, &cache_, &cb);
   ASSERT_EQ(net::OK, cb.GetResult(rv));
 }
 
@@ -110,7 +111,8 @@
     cache_thread_.Stop();
 
   if (!memory_only_ && integrity_) {
-    EXPECT_TRUE(CheckCacheIntegrity(path(), new_eviction_));
+    FilePath path = GetCacheFilePath();
+    EXPECT_TRUE(CheckCacheIntegrity(path, new_eviction_));
   }
 
   PlatformTest::TearDown();
@@ -125,9 +127,10 @@
   cache_impl_->ClearRefCountForTest();
 
   delete cache_impl_;
-  EXPECT_TRUE(CheckCacheIntegrity(path(), new_eviction_));
+  FilePath path = GetCacheFilePath();
+  EXPECT_TRUE(CheckCacheIntegrity(path, new_eviction_));
 
-  InitDiskCacheImpl(path());
+  InitDiskCacheImpl(path);
 }
 
 void DiskCacheTestWithCache::SetTestMode() {