base::Bind: Convert SSLHostInfo::WaitForDataReady.

BUG=none
TEST=none
R=csilv

Review URL: http://codereview.chromium.org/8784003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112899 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/net/socket/ssl_host_info.cc b/net/socket/ssl_host_info.cc
index d792d43a..83fab41 100644
--- a/net/socket/ssl_host_info.cc
+++ b/net/socket/ssl_host_info.cc
@@ -32,7 +32,6 @@ SSLHostInfo::SSLHostInfo(
       cert_verification_error_(ERR_CERT_INVALID),
       hostname_(hostname),
       cert_parsing_failed_(false),
-      cert_verification_callback_(NULL),
       rev_checking_enabled_(ssl_config.rev_checking_enabled),
       verify_ev_cert_(ssl_config.verify_ev_cert),
       verifier_(cert_verifier),
@@ -136,7 +135,7 @@ bool SSLHostInfo::ParseInner(const std::string& data) {
         VerifyCallback(rv);
     } else {
       cert_parsing_failed_ = true;
-      DCHECK(!cert_verification_callback_);
+      DCHECK(cert_verification_callback_.is_null());
     }
   }
 
@@ -181,11 +180,12 @@ const CertVerifyResult& SSLHostInfo::cert_verify_result() const {
   return cert_verify_result_;
 }
 
-int SSLHostInfo::WaitForCertVerification(OldCompletionCallback* callback) {
+int SSLHostInfo::WaitForCertVerification(const CompletionCallback& callback) {
   if (cert_verification_complete_)
     return cert_verification_error_;
+
   DCHECK(!cert_parsing_failed_);
-  DCHECK(!cert_verification_callback_);
+  DCHECK(cert_verification_callback_.is_null());
   DCHECK(!state_.certs.empty());
   cert_verification_callback_ = callback;
   return ERR_IO_PENDING;
@@ -206,10 +206,10 @@ void SSLHostInfo::VerifyCallback(int rv) {
   verification_end_time_ = now;
   cert_verification_complete_ = true;
   cert_verification_error_ = rv;
-  if (cert_verification_callback_) {
-    OldCompletionCallback* callback = cert_verification_callback_;
-    cert_verification_callback_ = NULL;
-    callback->Run(rv);
+  if (!cert_verification_callback_.is_null()) {
+    CompletionCallback callback = cert_verification_callback_;
+    cert_verification_callback_.Reset();
+    callback.Run(rv);
   }
 }