Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(391)

Side by Side Diff: net/socket/ssl_client_socket_nss.cc

Issue 7812036: Update base/timer.h code to pass through Location from call sites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
6 // from AuthCertificateCallback() in 6 // from AuthCertificateCallback() in
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
8 8
9 /* ***** BEGIN LICENSE BLOCK ***** 9 /* ***** BEGIN LICENSE BLOCK *****
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
(...skipping 2036 matching lines...) Expand 10 before | Expand all | Expand 10 after
2047 } 2047 }
2048 PORT_Free(common_name); 2048 PORT_Free(common_name);
2049 } 2049 }
2050 CERT_DestroyCertificate(cert); 2050 CERT_DestroyCertificate(cert);
2051 } 2051 }
2052 2052
2053 if (false_start && !that->handshake_callback_called_) { 2053 if (false_start && !that->handshake_callback_called_) {
2054 that->corked_ = true; 2054 that->corked_ = true;
2055 that->uncork_timer_.Start( 2055 that->uncork_timer_.Start(
2056 base::TimeDelta::FromMilliseconds(kCorkTimeoutMs), 2056 base::TimeDelta::FromMilliseconds(kCorkTimeoutMs),
2057 that, &SSLClientSocketNSS::UncorkAfterTimeout); 2057 that, &SSLClientSocketNSS::UncorkAfterTimeout, FROM_HERE);
2058 } 2058 }
2059 #endif 2059 #endif
2060 2060
2061 // Tell NSS to not verify the certificate. 2061 // Tell NSS to not verify the certificate.
2062 return SECSuccess; 2062 return SECSuccess;
2063 } 2063 }
2064 2064
2065 #if defined(NSS_PLATFORM_CLIENT_AUTH) 2065 #if defined(NSS_PLATFORM_CLIENT_AUTH)
2066 // static 2066 // static
2067 // NSS calls this if a client certificate is needed. 2067 // NSS calls this if a client certificate is needed.
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
2443 valid_thread_id_ = base::PlatformThread::CurrentId(); 2443 valid_thread_id_ = base::PlatformThread::CurrentId();
2444 } 2444 }
2445 2445
2446 bool SSLClientSocketNSS::CalledOnValidThread() const { 2446 bool SSLClientSocketNSS::CalledOnValidThread() const {
2447 EnsureThreadIdAssigned(); 2447 EnsureThreadIdAssigned();
2448 base::AutoLock auto_lock(lock_); 2448 base::AutoLock auto_lock(lock_);
2449 return valid_thread_id_ == base::PlatformThread::CurrentId(); 2449 return valid_thread_id_ == base::PlatformThread::CurrentId();
2450 } 2450 }
2451 2451
2452 } // namespace net 2452 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698