diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
commit | f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch) | |
tree | 6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/base/cert_verifier.cc | |
parent | d1666539b57bf8552e203d355fd09909d36f9732 (diff) | |
download | chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2 |
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback.
Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g.
BUG=98719
TEST=none
Review URL: http://codereview.chromium.org/8070013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/cert_verifier.cc')
-rw-r--r-- | net/base/cert_verifier.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/base/cert_verifier.cc b/net/base/cert_verifier.cc index db630dd..ea90ea9 100644 --- a/net/base/cert_verifier.cc +++ b/net/base/cert_verifier.cc @@ -87,7 +87,7 @@ bool CachedCertVerifyResult::HasExpired(const base::Time current_time) const { // Represents the output and result callback of a request. class CertVerifierRequest { public: - CertVerifierRequest(CompletionCallback* callback, + CertVerifierRequest(OldCompletionCallback* callback, CertVerifyResult* verify_result) : callback_(callback), verify_result_(verify_result) { @@ -112,7 +112,7 @@ class CertVerifierRequest { bool canceled() const { return !callback_; } private: - CompletionCallback* callback_; + OldCompletionCallback* callback_; CertVerifyResult* verify_result_; }; @@ -309,7 +309,7 @@ int CertVerifier::Verify(X509Certificate* cert, const std::string& hostname, int flags, CertVerifyResult* verify_result, - CompletionCallback* callback, + OldCompletionCallback* callback, RequestHandle* out_req) { DCHECK(CalledOnValidThread()); @@ -466,7 +466,7 @@ int SingleRequestCertVerifier::Verify(X509Certificate* cert, const std::string& hostname, int flags, CertVerifyResult* verify_result, - CompletionCallback* callback) { + OldCompletionCallback* callback) { // Should not be already in use. DCHECK(!cur_request_ && !cur_request_callback_); @@ -493,7 +493,7 @@ int SingleRequestCertVerifier::Verify(X509Certificate* cert, void SingleRequestCertVerifier::OnVerifyCompletion(int result) { DCHECK(cur_request_ && cur_request_callback_); - CompletionCallback* callback = cur_request_callback_; + OldCompletionCallback* callback = cur_request_callback_; // Clear the outstanding request information. cur_request_ = NULL; |