diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 14:15:36 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 14:15:36 +0000 |
| commit | 2c5c9d596ad422529c88b47db2b60eff9410cde0 (patch) | |
| tree | 0625f8f8cb92d6c5ec93efb6892beb13bc6a43bb /net/http/http_cache.h | |
| parent | 4ba14e1044e2e837a8c81894df156e4fd4be86bd (diff) | |
| download | chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.zip chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.tar.gz chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.tar.bz2 | |
Reverts a commit that caused ASAN failures, and 2 dependent commits.
The primary commit was 113249, the dependents were 113261, 113263.
This is a speculative revert, r113249 is by far the likeliest culprit in the blamelist of build http://build.chromium.org/p/chromium.memory/builders/ASAN%20Tests%20%282%29/builds/2325 which is where we started seeing the ASAN failures in question, will un-revert if it does not fix the problem.
TBR=jhawkins@chromium.org
BUG=none
Review URL: http://codereview.chromium.org/8832006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_cache.h')
| -rw-r--r-- | net/http/http_cache.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 176d9ff..526da58 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -157,8 +157,7 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory, // 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, - const CompletionCallback& callback); + int GetBackend(disk_cache::Backend** backend, OldCompletionCallback* callback); // Returns the current backend (can be NULL). disk_cache::Backend* GetCurrentBackend() const; @@ -191,7 +190,7 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory, // referred to by |url| and |http_method|. void OnExternalCacheHit(const GURL& url, const std::string& http_method); - // HttpTransactionFactory implementation. + // HttpTransactionFactory implementation: virtual int CreateTransaction(scoped_ptr<HttpTransaction>* trans) OVERRIDE; virtual HttpCache* GetCache() OVERRIDE; virtual HttpNetworkSession* GetSession() OVERRIDE; @@ -244,7 +243,7 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory, // Creates the |backend| object and notifies the |callback| when the operation // completes. Returns an error code. int CreateBackend(disk_cache::Backend** backend, - const CompletionCallback& callback); + OldCompletionCallback* callback); // Makes sure that the backend creation is complete before allowing the // provided transaction to use the object. Returns an error code. |trans| |