Fixed first pass at adding http/backend cache events to the NetLog. ...

net/http/http_cache.h

 // Copyright (c) 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.
 
 // 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 69 matching lines @@
   class BackendFactory {
    public:
     virtual ~BackendFactory() {}
 
     // The actual method to build the backend. Returns a net error code. If
     // ERR_IO_PENDING is returned, the |callback| will be notified when the
     // operation completes, and |backend| must remain valid until the
     // notification arrives.
     // The implementation must not access the factory object after invoking the
     // |callback| because the object can be deleted from within the callback.
-    virtual int CreateBackend(disk_cache::Backend** backend,
+    virtual int CreateBackend(NetLog* net_log,
+                              disk_cache::Backend** backend,
                               CompletionCallback* callback) = 0;
   };
 
   // A default backend factory for the common use cases.
   class DefaultBackend : public BackendFactory {
    public:
     // |path| is the destination for any files used by the backend, and
     // |cache_thread| is the thread where disk operations should take place. If
     // |max_bytes| is  zero, a default value will be calculated automatically.
     DefaultBackend(CacheType type, const FilePath& path, int max_bytes,
                    base::MessageLoopProxy* thread);
     virtual ~DefaultBackend();
 
     // Returns a factory for an in-memory cache.
     static BackendFactory* InMemory(int max_bytes);
 
     // BackendFactory implementation.
-    virtual int CreateBackend(disk_cache::Backend** backend,
+    virtual int CreateBackend(NetLog* net_log,
+                              disk_cache::Backend** backend,
                               CompletionCallback* callback);
 
    private:
     CacheType type_;
     const FilePath path_;
     int max_bytes_;
     scoped_refptr<base::MessageLoopProxy> thread_;
   };
 
   // The disk cache is initialized lazily (by CreateTransaction) in this case.
@@ skipping 14 matching lines @@
   // network layer with a shared HttpNetworkSession in order for multiple
   // network layers to share information (e.g. authenication data). The
   // HttpCache takes ownership of the |backend_factory|.
   HttpCache(HttpNetworkSession* session, BackendFactory* backend_factory);
 
   // Initialize the cache from its component parts, which is useful for
   // testing.  The lifetime of the network_layer and backend_factory are managed
   // by the HttpCache and will be destroyed using |delete| when the HttpCache is
   // destroyed.
   HttpCache(HttpTransactionFactory* network_layer,
+            NetLog* net_log,
             BackendFactory* backend_factory);
 
   HttpTransactionFactory* network_layer() { return network_layer_.get(); }
 
   // Retrieves the cache backend for this HttpCache instance. If the backend
   // is not initialized yet, this method will initialize it. The return value is
   // a network error code, and it could be ERR_IO_PENDING, in which case the
   // |callback| will be notified when the operation completes. The pointer that
   // receives the |backend| must remain valid until the operation completes.
   int GetBackend(disk_cache::Backend** backend, CompletionCallback* callback);
@@ skipping 55 matching lines @@
   typedef std::list<WorkItem*> WorkItemList;
 
   struct ActiveEntry {
     disk_cache::Entry* disk_entry;
     Transaction*       writer;
     TransactionList    readers;
     TransactionList    pending_queue;
     bool               will_process_pending_queue;
     bool               doomed;
 
-    explicit ActiveEntry(disk_cache::Entry*);
+    explicit ActiveEntry(disk_cache::Entry* entry);
     ~ActiveEntry();
   };
 
   typedef base::hash_map<std::string, ActiveEntry*> ActiveEntriesMap;
   typedef base::hash_map<std::string, PendingOp*> PendingOpsMap;
   typedef std::set<ActiveEntry*> ActiveEntriesSet;
 
   // Methods ------------------------------------------------------------------
 
   // Creates the |backend| object and notifies the |callback| when the operation
@@ skipping 108 matching lines @@
 
   // Processes BackendCallback notifications.
   void OnIOComplete(int result, PendingOp* entry);
 
   // Processes the backend creation notification.
   void OnBackendCreated(int result, PendingOp* pending_op);
 
 
   // Variables ----------------------------------------------------------------
 
+  NetLog* net_log_;
+
   // Used when lazily constructing the disk_cache_.
   scoped_ptr<BackendFactory> backend_factory_;
   bool building_backend_;
 
   Mode mode_;
 
   scoped_ptr<SSLHostInfoFactoryAdaptor> ssl_host_info_factory_;
 
   scoped_ptr<HttpTransactionFactory> network_layer_;
   scoped_ptr<disk_cache::Backend> disk_cache_;
@@ skipping 11 matching lines @@
 
   typedef base::hash_map<std::string, int> PlaybackCacheMap;
   scoped_ptr<PlaybackCacheMap> playback_cache_map_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpCache);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_CACHE_H_