| Index: net/http/http_cache.h
|
| diff --git a/net/http/http_cache.h b/net/http/http_cache.h
|
| index dd9d0cdfcae36cfcbff10cbbeacc6874179768c9..19b753b9d332bdac8aad761b5bddf5cbde567141 100644
|
| --- a/net/http/http_cache.h
|
| +++ b/net/http/http_cache.h
|
| @@ -99,8 +99,10 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
|
| // |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, BackendType backend_type,
|
| - const base::FilePath& path, int max_bytes,
|
| + DefaultBackend(CacheType type,
|
| + BackendType backend_type,
|
| + const base::FilePath& path,
|
| + int max_bytes,
|
| base::MessageLoopProxy* thread);
|
| virtual ~DefaultBackend();
|
|
|
| @@ -156,7 +158,8 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
|
| disk_cache::Backend* GetCurrentBackend() const;
|
|
|
| // Given a header data blob, convert it to a response info object.
|
| - static bool ParseResponseInfo(const char* data, int len,
|
| + static bool ParseResponseInfo(const char* data,
|
| + int len,
|
| HttpResponseInfo* response_info,
|
| bool* response_truncated);
|
|
|
| @@ -199,9 +202,8 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
|
| // network changes (e.g. host unreachable). The old network layer is
|
| // returned to allow for filter patterns that only intercept
|
| // some creation requests. Note ownership exchange.
|
| - scoped_ptr<HttpTransactionFactory>
|
| - SetHttpNetworkTransactionFactoryForTesting(
|
| - scoped_ptr<HttpTransactionFactory> new_network_layer);
|
| + scoped_ptr<HttpTransactionFactory> SetHttpNetworkTransactionFactoryForTesting(
|
| + scoped_ptr<HttpTransactionFactory> new_network_layer);
|
|
|
| private:
|
| // Types --------------------------------------------------------------------
|
| @@ -232,11 +234,11 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
|
| ~ActiveEntry();
|
|
|
| disk_cache::Entry* disk_entry;
|
| - Transaction* writer;
|
| - TransactionList readers;
|
| - TransactionList pending_queue;
|
| - bool will_process_pending_queue;
|
| - bool doomed;
|
| + Transaction* writer;
|
| + TransactionList readers;
|
| + TransactionList pending_queue;
|
| + bool will_process_pending_queue;
|
| + bool doomed;
|
| };
|
|
|
| typedef base::hash_map<std::string, ActiveEntry*> ActiveEntriesMap;
|
| @@ -304,13 +306,15 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
|
| // Opens the disk cache entry associated with |key|, returning an ActiveEntry
|
| // in |*entry|. |trans| will be notified via its IO callback if this method
|
| // returns ERR_IO_PENDING.
|
| - int OpenEntry(const std::string& key, ActiveEntry** entry,
|
| + int OpenEntry(const std::string& key,
|
| + ActiveEntry** entry,
|
| Transaction* trans);
|
|
|
| // Creates the disk cache entry associated with |key|, returning an
|
| // ActiveEntry in |*entry|. |trans| will be notified via its IO callback if
|
| // this method returns ERR_IO_PENDING.
|
| - int CreateEntry(const std::string& key, ActiveEntry** entry,
|
| + int CreateEntry(const std::string& key,
|
| + ActiveEntry** entry,
|
| Transaction* trans);
|
|
|
| // Destroys an ActiveEntry (active or doomed).
|
|
|