More net/ method ordering.

net/http/disk_cache_based_ssl_host_info.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.
 
 #ifndef NET_HTTP_DISK_CACHE_BASED_SSL_HOST_INFO_H
 #define NET_HTTP_DISK_CACHE_BASED_SSL_HOST_INFO_H
 
 #include <string>
 
 #include "base/scoped_ptr.h"
@@ skipping 34 matching lines @@
     READ_COMPLETE,
     WAIT_FOR_DATA_READY_DONE,
     CREATE,
     CREATE_COMPLETE,
     WRITE,
     WRITE_COMPLETE,
     SET_DONE,
     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);
 
     disk_cache::Backend* backend_;
     disk_cache::Entry* entry_;
   };
 
+  virtual ~DiskCacheBasedSSLHostInfo();
+
   std::string key() const;
 
   void DoLoop(int rv);
 
   int DoGetBackendComplete(int rv);
   int DoOpenComplete(int rv);
   int DoReadComplete(int rv);
   int DoWriteComplete(int rv);
   int DoCreateComplete(int rv);
 
   int DoGetBackend();
   int DoOpen();
   int DoRead();
+  int DoWrite();
   int DoCreate();
-  int DoWrite();
 
   // WaitForDataReadyDone is the terminal state of the read operation.
   int WaitForDataReadyDone();
+
   // SetDone is the terminal state of the write operation.
   int SetDone();
 
   // IsCallbackPending returns true if we have a pending callback.
   bool IsCallbackPending() const;
 
   base::WeakPtrFactory<DiskCacheBasedSSLHostInfo> weak_ptr_factory_;
   CallbackImpl* callback_;
   State state_;
   bool ready_;
   std::string new_data_;
   const std::string hostname_;
   HttpCache* const http_cache_;
   disk_cache::Backend* backend_;
   disk_cache::Entry* entry_;
   CompletionCallback* user_callback_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   scoped_refptr<net::IOBuffer> write_buffer_;
   std::string data_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_DISK_CACHE_BASED_SSL_HOST_INFO_H