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

net/disk_cache/disk_cache_test_base.h

 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 #define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/thread.h"
 #include "net/base/cache_type.h"
-#include "net/disk_cache/disk_cache_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 class FilePath;
 
 namespace net {
 
 class IOBuffer;
 
 }  // namespace net
@@ skipping 63 matching lines @@
   }
 
   void UseCurrentThread() {
     use_current_thread_ = true;
   }
 
   void SetCacheType(net::CacheType type) {
     type_ = type;
   }
 
-  FilePath path() const {
-    return test_cache_.path();
-  }
-
   // Utility methods to access the cache and wait for each operation to finish.
   int OpenEntry(const std::string& key, disk_cache::Entry** entry);
   int CreateEntry(const std::string& key, disk_cache::Entry** entry);
   int DoomEntry(const std::string& key);
   int DoomAllEntries();
   int DoomEntriesBetween(const base::Time initial_time,
                          const base::Time end_time);
   int DoomEntriesSince(const base::Time initial_time);
   int OpenNextEntry(void** iter, disk_cache::Entry** next_entry);
   void FlushQueueForTest();
@@ skipping 24 matching lines @@
   bool integrity_;
   bool use_current_thread_;
   // This is intentionally left uninitialized, to be used by any test.
   bool success_;
 
  private:
   void InitMemoryCache();
   void InitDiskCache();
   void InitDiskCacheImpl(const FilePath& path);
 
-  ScopedTestCache test_cache_;
   base::Thread cache_thread_;
-
   DISALLOW_COPY_AND_ASSIGN(DiskCacheTestWithCache);
 };
 
 #endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_