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

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

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed location of enable_connect_job_waiting_ and added documentation. Created 6 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 7
8 #include <certt.h> 8 #include <certt.h>
9 #include <keyt.h> 9 #include <keyt.h>
10 #include <nspr.h> 10 #include <nspr.h>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // behaviour is desired, for performance or compatibility, the current task 61 // behaviour is desired, for performance or compatibility, the current task
62 // runner should be supplied instead. 62 // runner should be supplied instead.
63 SSLClientSocketNSS(base::SequencedTaskRunner* nss_task_runner, 63 SSLClientSocketNSS(base::SequencedTaskRunner* nss_task_runner,
64 scoped_ptr<ClientSocketHandle> transport_socket, 64 scoped_ptr<ClientSocketHandle> transport_socket,
65 const HostPortPair& host_and_port, 65 const HostPortPair& host_and_port,
66 const SSLConfig& ssl_config, 66 const SSLConfig& ssl_config,
67 const SSLClientSocketContext& context); 67 const SSLClientSocketContext& context);
68 virtual ~SSLClientSocketNSS(); 68 virtual ~SSLClientSocketNSS();
69 69
70 // SSLClientSocket implementation. 70 // SSLClientSocket implementation.
71 virtual bool InSessionCache() const OVERRIDE;
72 virtual void WatchSessionForCompletion(
73 const base::Closure& callback) OVERRIDE;
74 virtual void SetSocketFailureCallback(const base::Closure& callback) OVERRIDE;
75 virtual void SetIsLeader() OVERRIDE;
76 virtual void OnSocketFailure() OVERRIDE;
71 virtual void GetSSLCertRequestInfo( 77 virtual void GetSSLCertRequestInfo(
72 SSLCertRequestInfo* cert_request_info) OVERRIDE; 78 SSLCertRequestInfo* cert_request_info) OVERRIDE;
73 virtual NextProtoStatus GetNextProto(std::string* proto, 79 virtual NextProtoStatus GetNextProto(std::string* proto,
74 std::string* server_protos) OVERRIDE; 80 std::string* server_protos) OVERRIDE;
75 81
76 // SSLSocket implementation. 82 // SSLSocket implementation.
77 virtual int ExportKeyingMaterial(const base::StringPiece& label, 83 virtual int ExportKeyingMaterial(const base::StringPiece& label,
78 bool has_context, 84 bool has_context,
79 const base::StringPiece& context, 85 const base::StringPiece& context,
80 unsigned char* out, 86 unsigned char* out,
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // Added the following code Debugging in release mode. 217 // Added the following code Debugging in release mode.
212 mutable base::Lock lock_; 218 mutable base::Lock lock_;
213 // This is mutable so that CalledOnValidThread can set it. 219 // This is mutable so that CalledOnValidThread can set it.
214 // It's guarded by |lock_|. 220 // It's guarded by |lock_|.
215 mutable base::PlatformThreadId valid_thread_id_; 221 mutable base::PlatformThreadId valid_thread_id_;
216 }; 222 };
217 223
218 } // namespace net 224 } // namespace net
219 225
220 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 226 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698