Index: net/http/disk_cache_based_ssl_host_info.h |
diff --git a/net/http/disk_cache_based_ssl_host_info.h b/net/http/disk_cache_based_ssl_host_info.h |
index 2beb7e4ab29bd89086d3833edb05499286de1049..9d04ba0d8e6fedcf2457aacc360586aaa05fa2db 100644 |
--- a/net/http/disk_cache_based_ssl_host_info.h |
+++ b/net/http/disk_cache_based_ssl_host_info.h |
@@ -52,29 +52,20 @@ class DiskCacheBasedSSLHostInfo : public SSLHostInfo, |
NONE, |
}; |
- ~DiskCacheBasedSSLHostInfo(); |
- |
class CallbackImpl : public CallbackRunner<Tuple1<int> > { |
public: |
CallbackImpl(const base::WeakPtr<DiskCacheBasedSSLHostInfo>& obj, |
- void (DiskCacheBasedSSLHostInfo::*meth) (int)) |
- : obj_(obj), |
- meth_(meth) { |
- } |
- |
- virtual void RunWithParams(const Tuple1<int>& params) { |
- if (!obj_) { |
- delete this; |
- } else { |
- DispatchToMethod(obj_.get(), meth_, params); |
- } |
- } |
+ void (DiskCacheBasedSSLHostInfo::*meth) (int)); |
+ virtual ~CallbackImpl(); |
disk_cache::Backend** backend_pointer() { return &backend_; } |
disk_cache::Entry** entry_pointer() { return &entry_; } |
disk_cache::Backend* backend() const { return backend_; } |
disk_cache::Entry* entry() const { return entry_; } |
+ // CallbackRunner<Tuple1<int> >: |
+ virtual void RunWithParams(const Tuple1<int>& params); |
+ |
private: |
base::WeakPtr<DiskCacheBasedSSLHostInfo> obj_; |
void (DiskCacheBasedSSLHostInfo::*meth_) (int); |
@@ -83,6 +74,8 @@ class DiskCacheBasedSSLHostInfo : public SSLHostInfo, |
disk_cache::Entry* entry_; |
}; |
+ virtual ~DiskCacheBasedSSLHostInfo(); |
+ |
std::string key() const; |
void DoLoop(int rv); |
@@ -96,11 +89,12 @@ class DiskCacheBasedSSLHostInfo : public SSLHostInfo, |
int DoGetBackend(); |
int DoOpen(); |
int DoRead(); |
- int DoCreate(); |
int DoWrite(); |
+ int DoCreate(); |
// WaitForDataReadyDone is the terminal state of the read operation. |
int WaitForDataReadyDone(); |
+ |
// SetDone is the terminal state of the write operation. |
int SetDone(); |