base::Bind: Convert SSLHostInfo::WaitForDataReady.

net/socket/ssl_host_info.h

 // Copyright (c) 2011 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_SOCKET_SSL_HOST_INFO_H_
 #define NET_SOCKET_SSL_HOST_INFO_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 33 matching lines @@
   // WaitForDataReady returns OK if the fetch of the requested data has
   // completed. Otherwise it returns ERR_IO_PENDING and will call |callback| on
   // the current thread when ready.
   //
   // Only a single callback can be outstanding at a given time and, in the
   // event that WaitForDataReady returns OK, it's the caller's responsibility
   // to delete |callback|.
   //
   // |callback| may be NULL, in which case ERR_IO_PENDING may still be returned
   // but, obviously, a callback will never be made.
-  virtual int WaitForDataReady(OldCompletionCallback* callback) = 0;
+  virtual int WaitForDataReady(const CompletionCallback& callback) = 0;
 
   // Persist allows for the host information to be updated for future users.
   // This is a fire and forget operation: the caller may drop its reference
   // from this object and the store operation will still complete. This can
   // only be called once WaitForDataReady has returned OK or called its
   // callback.
   virtual void Persist() = 0;
 
   // StartDnsLookup triggers a DNS lookup for the host.
   void StartDnsLookup(DnsRRResolver* dnsrr_resolver);
@@ skipping 19 matching lines @@
 
   // If WaitForCertVerification reports the certificate verification has
   // completed, then this contains the result of verifying the certificate.
   const CertVerifyResult& cert_verify_result() const;
 
   // WaitForCertVerification returns ERR_IO_PENDING if the certificate chain in
   // |state().certs| is still being validated and arranges for the given
   // callback to be called when the verification completes. If the verification
   // has already finished then WaitForCertVerification returns the result of
   // that verification.
-  int WaitForCertVerification(OldCompletionCallback* callback);
+  int WaitForCertVerification(const CompletionCallback& callback);
 
   base::TimeTicks verification_start_time() const {
     return verification_start_time_;
   }
 
   base::TimeTicks verification_end_time() const {
     return verification_end_time_;
   }
 
  protected:
   // Parse parses an opaque blob of data and fills out the public member fields
   // of this object. It returns true iff the parse was successful. The public
   // member fields will be set to something sane in any case.
   bool Parse(const std::string& data);
   std::string Serialize() const;
   State state_;
   bool cert_verification_complete_;
   int cert_verification_error_;
 
  private:
   // This is the callback function which the CertVerifier calls via |callback_|.
   void VerifyCallback(int rv);
 
   // ParseInner is a helper function for Parse.
   bool ParseInner(const std::string& data);
 
   // This is the hostname that we'll validate the certificates against.
   const std::string hostname_;
   bool cert_parsing_failed_;
-  OldCompletionCallback* cert_verification_callback_;
+  CompletionCallback cert_verification_callback_;
   // These three members are taken from the SSLConfig.
   bool rev_checking_enabled_;
   bool verify_ev_cert_;
   scoped_refptr<CRLSet> crl_set_;
   base::TimeTicks verification_start_time_;
   base::TimeTicks verification_end_time_;
   CertVerifyResult cert_verify_result_;
   SingleRequestCertVerifier verifier_;
   scoped_refptr<X509Certificate> cert_;
   base::WeakPtrFactory<SSLHostInfo> weak_factory_;
@@ skipping 12 matching lines @@
 
   // GetForHost returns a fresh, allocated SSLHostInfo for the given hostname
   // or NULL on failure.
   virtual SSLHostInfo* GetForHost(const std::string& hostname,
                                   const SSLConfig& ssl_config) = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_HOST_INFO_H_