Revert 156846 - Http Cache: Add code for simulating an infinite HTTP cache.

net/http/http_cache.h

 // Copyright (c) 2012 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 file declares a HttpTransactionFactory implementation that can be
 // layered on top of another HttpTransactionFactory to add HTTP caching.  The
 // caching logic follows RFC 2616 (any exceptions are called out in the code).
 //
 // The HttpCache takes a disk_cache::Backend as a parameter, and uses that for
 // the cache storage.
@@ skipping 14 matching lines @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "base/time.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/cache_type.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
 #include "net/base/net_export.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_transaction_factory.h"
-#include "net/http/infinite_cache.h"
 
 class GURL;
 
 namespace disk_cache {
 class Backend;
 class Entry;
 }
 
 namespace net {
 
@@ skipping 131 matching lines @@
   // Close all idle connections. Will close all sockets not in active use.
   void CloseIdleConnections();
 
   // Called whenever an external cache in the system reuses the resource
   // referred to by |url| and |http_method|.
   void OnExternalCacheHit(const GURL& url, const std::string& http_method);
 
   // Initializes the Infinite Cache, if selected by the field trial.
   void InitializeInfiniteCache(const FilePath& path);
 
-  // Returns a pointer to the Infinite Cache.
-  InfiniteCache* infinite_cache() { return &infinite_cache_; }
-
   // HttpTransactionFactory implementation:
   virtual int CreateTransaction(scoped_ptr<HttpTransaction>* trans,
                                 HttpTransactionDelegate* delegate) OVERRIDE;
   virtual HttpCache* GetCache() OVERRIDE;
   virtual HttpNetworkSession* GetSession() OVERRIDE;
 
  protected:
   // Disk cache entry data indices.
   enum {
     kResponseInfoIndex = 0,
     kResponseContentIndex,
     kMetadataIndex,
 
     // Must remain at the end of the enum.
     kNumCacheEntryDataIndices
   };
   friend class ViewCacheHelper;
 
  private:
   // Types --------------------------------------------------------------------
 
   class MetadataWriter;
   class Transaction;
   class WorkItem;
   friend class Transaction;
-  friend class InfiniteCache;
   struct PendingOp;  // Info for an entry under construction.
 
   typedef std::list<Transaction*> TransactionList;
   typedef std::list<WorkItem*> WorkItemList;
 
   struct ActiveEntry {
     explicit ActiveEntry(disk_cache::Entry* entry);
     ~ActiveEntry();
 
     disk_cache::Entry* disk_entry;
@@ skipping 158 matching lines @@
   ActiveEntriesMap active_entries_;
 
   // The set of doomed entries.
   ActiveEntriesSet doomed_entries_;
 
   // The set of entries "under construction".
   PendingOpsMap pending_ops_;
 
   scoped_ptr<PlaybackCacheMap> playback_cache_map_;
 
-  InfiniteCache infinite_cache_;
-
   DISALLOW_COPY_AND_ASSIGN(HttpCache);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_CACHE_H_