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

by using a unique directory for disk cache tests.

BUG=54098
TEST=run net_unittests using tools/parallel_launcher/parallel_launcher.py

Review URL: http://codereview.chromium.org/3410008

TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3387012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60166 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 12 deletions

diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc
index 51fda4c..98dcbe1 100644
--- a/net/disk_cache/stress_cache.cc
+++ b/net/disk_cache/stress_cache.cc
@@ -29,7 +29,6 @@
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/file_path.h"
-#include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -51,16 +50,6 @@ using base::Time;
 const int kError = -1;
 const int kExpectedCrash = 100;
 
-FilePath GetStressCacheFilePath() {
-  FilePath path;
-  PathService::Get(base::DIR_TEMP, &path);  // Ignore return value;
-  path = path.AppendASCII("cache_test_stress");
-  if (!file_util::PathExists(path))
-    file_util::CreateDirectory(path);
-
-  return path;
-}
-
 // Starts a new process.
 int RunSlave(int iteration) {
   FilePath exe;
@@ -103,7 +92,7 @@ int MasterCode() {
 // to know which instance of the application wrote them.
 void StressTheCache(int iteration) {
   int cache_size = 0x800000;  // 8MB
-  FilePath path = GetStressCacheFilePath();
+  FilePath path = GetCacheFilePath().InsertBeforeExtensionASCII("_stress");
 
   base::Thread cache_thread("CacheThread");
   if (!cache_thread.StartWithOptions(