| Index: net/http/http_cache_transaction.h
|
| diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h
|
| index f60a445b35840f1e6d53136dc40728fd9e52269d..7629c0b7a399c23d634befb4e26b084848a137f1 100644
|
| --- a/net/http/http_cache_transaction.h
|
| +++ b/net/http/http_cache_transaction.h
|
| @@ -93,23 +93,24 @@ class HttpCache::Transaction : public HttpTransaction {
|
| // to the cache entry.
|
| LoadState GetWriterLoadState() const;
|
|
|
| - OldCompletionCallback* io_callback() { return &io_callback_; }
|
| + const CompletionCallback& io_callback() { return io_callback_; }
|
|
|
| const BoundNetLog& net_log() const;
|
|
|
| // HttpTransaction methods:
|
| - virtual int Start(const HttpRequestInfo*, OldCompletionCallback*,
|
| + virtual int Start(const HttpRequestInfo*, const CompletionCallback&,
|
| const BoundNetLog&) OVERRIDE;
|
| virtual int RestartIgnoringLastError(
|
| - OldCompletionCallback* callback) OVERRIDE;
|
| - virtual int RestartWithCertificate(X509Certificate* client_cert,
|
| - OldCompletionCallback* callback) OVERRIDE;
|
| + const CompletionCallback& callback) OVERRIDE;
|
| + virtual int RestartWithCertificate(
|
| + X509Certificate* client_cert,
|
| + const CompletionCallback& callback) OVERRIDE;
|
| virtual int RestartWithAuth(const AuthCredentials& credentials,
|
| - OldCompletionCallback* callback) OVERRIDE;
|
| + const CompletionCallback& callback) OVERRIDE;
|
| virtual bool IsReadyToRestartForAuth() OVERRIDE;
|
| virtual int Read(IOBuffer* buf,
|
| int buf_len,
|
| - OldCompletionCallback* callback) OVERRIDE;
|
| + const CompletionCallback& callback) OVERRIDE;
|
| virtual void StopCaching() OVERRIDE;
|
| virtual void DoneReading() OVERRIDE;
|
| virtual const HttpResponseInfo* GetResponseInfo() const OVERRIDE;
|
| @@ -338,7 +339,7 @@ class HttpCache::Transaction : public HttpTransaction {
|
| base::TimeTicks entry_lock_waiting_since_;
|
| HttpCache::ActiveEntry* new_entry_;
|
| scoped_ptr<HttpTransaction> network_trans_;
|
| - OldCompletionCallback* callback_; // Consumer's callback.
|
| + CompletionCallback callback_; // Consumer's callback.
|
| HttpResponseInfo response_;
|
| HttpResponseInfo auth_response_;
|
| const HttpResponseInfo* new_response_;
|
| @@ -360,7 +361,7 @@ class HttpCache::Transaction : public HttpTransaction {
|
| int write_len_;
|
| scoped_ptr<PartialData> partial_; // We are dealing with range requests.
|
| uint64 final_upload_progress_;
|
| - OldCompletionCallbackImpl<Transaction> io_callback_;
|
| + CompletionCallback io_callback_;
|
| scoped_refptr<CancelableOldCompletionCallback<Transaction> > cache_callback_;
|
| scoped_refptr<CancelableOldCompletionCallback<Transaction> >
|
| write_headers_callback_;
|
|
|