Revert of HttpCache::Transaction layer allowing parallel validation

net/http/mock_http_cache.h

 // Copyright (c) 2011 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.
 
 // This is a mock of the http cache and related testing classes. To be fair, it
 // is not really a mock http cache given that it uses the real implementation of
 // the http cache, but it has fake implementations of all required components,
 // so it is useful for unit tests at the http layer.
 
 #ifndef NET_HTTP_MOCK_HTTP_CACHE_H_
@@ skipping 140 matching lines @@
   void set_soft_failures(bool value) { soft_failures_ = value; }
 
   // Makes sure that CreateEntry is not called twice for a given key.
   void set_double_create_check(bool value) { double_create_check_ = value; }
 
   // Makes all requests for data ranges to fail as not implemented.
   void set_fail_sparse_requests() { fail_sparse_requests_ = true; }
 
   void ReleaseAll();
 
-  bool IsDiskEntryDoomed(const std::string& key);
-
  private:
   using EntryMap = std::unordered_map<std::string, MockDiskEntry*>;
   class NotImplementedIterator;
 
   void CallbackLater(const CompletionCallback& callback, int result);
 
   EntryMap entries_;
   int open_count_;
   int create_count_;
   bool fail_requests_;
@@ skipping 56 matching lines @@
                           disk_cache::Entry** entry,
                           NetLog* net_log);
 
   // Returns the test mode after considering the global override.
   static int GetTestMode(int test_mode);
 
   // Overrides the test mode for a given operation. Remember to reset it after
   // the test! (by setting test_mode to zero).
   static void SetTestMode(int test_mode);
 
-  // Functions to test the state of ActiveEntry.
-
-  bool IsWriterPresent(const std::string& key);
-  bool IsHeadersTransactionPresent(const std::string& key);
-  int GetCountReaders(const std::string& key);
-  int GetCountAddToEntryQueue(const std::string& key);
-  int GetCountDoneHeadersQueue(const std::string& key);
-
  private:
   HttpCache http_cache_;
 };
 
 // This version of the disk cache doesn't invoke CreateEntry callbacks.
 class MockDiskCacheNoCB : public MockDiskCache {
   int CreateEntry(const std::string& key,
                   disk_cache::Entry** entry,
                   const CompletionCallback& callback) override;
 };
@@ skipping 29 matching lines @@
 
   std::unique_ptr<disk_cache::Backend>* backend_;
   CompletionCallback callback_;
   bool block_;
   bool fail_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_MOCK_HTTP_CACHE_H_