| Index: net/base/multi_threaded_cert_verifier.cc
|
| ===================================================================
|
| --- net/base/multi_threaded_cert_verifier.cc (revision 142108)
|
| +++ net/base/multi_threaded_cert_verifier.cc (working copy)
|
| @@ -92,7 +92,7 @@
|
| : callback_(callback),
|
| verify_result_(verify_result),
|
| net_log_(net_log) {
|
| - net_log_.BeginEvent(NetLog::TYPE_CERT_VERIFIER_REQUEST, NULL);
|
| + net_log_.BeginEvent(NetLog::TYPE_CERT_VERIFIER_REQUEST);
|
| }
|
|
|
| ~CertVerifierRequest() {
|
| @@ -102,15 +102,15 @@
|
| void Cancel() {
|
| callback_.Reset();
|
| verify_result_ = NULL;
|
| - net_log_.AddEvent(NetLog::TYPE_CANCELLED, NULL);
|
| - net_log_.EndEvent(NetLog::TYPE_CERT_VERIFIER_REQUEST, NULL);
|
| + net_log_.AddEvent(NetLog::TYPE_CANCELLED);
|
| + net_log_.EndEvent(NetLog::TYPE_CERT_VERIFIER_REQUEST);
|
| }
|
|
|
| // Copies the contents of |verify_result| to the caller's
|
| // CertVerifyResult and calls the callback.
|
| void Post(const MultiThreadedCertVerifier::CachedResult& verify_result) {
|
| if (!callback_.is_null()) {
|
| - net_log_.EndEvent(NetLog::TYPE_CERT_VERIFIER_REQUEST, NULL);
|
| + net_log_.EndEvent(NetLog::TYPE_CERT_VERIFIER_REQUEST);
|
| *verify_result_ = verify_result.result;
|
| callback_.Run(verify_result.error);
|
| }
|
| @@ -271,8 +271,8 @@
|
|
|
| ~CertVerifierJob() {
|
| if (worker_) {
|
| - net_log_.AddEvent(NetLog::TYPE_CANCELLED, NULL);
|
| - net_log_.EndEvent(NetLog::TYPE_CERT_VERIFIER_JOB, NULL);
|
| + net_log_.AddEvent(NetLog::TYPE_CANCELLED);
|
| + net_log_.EndEvent(NetLog::TYPE_CERT_VERIFIER_JOB);
|
| worker_->Cancel();
|
| DeleteAllCanceled();
|
| }
|
| @@ -289,7 +289,7 @@
|
| void HandleResult(
|
| const MultiThreadedCertVerifier::CachedResult& verify_result) {
|
| worker_ = NULL;
|
| - net_log_.EndEvent(NetLog::TYPE_CERT_VERIFIER_JOB, NULL);
|
| + net_log_.EndEvent(NetLog::TYPE_CERT_VERIFIER_JOB);
|
| UMA_HISTOGRAM_CUSTOM_TIMES("Net.CertVerifier_Job_Latency",
|
| base::TimeTicks::Now() - start_time_,
|
| base::TimeDelta::FromMilliseconds(1),
|
|
|