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

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

Issue 476313004: Change the lifespan of SSlConnectJobMessengers so that they are created (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mark the SSLConnectJobMessenger constructor as explicit Created 6 years, 4 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
« no previous file with comments | « net/socket/ssl_client_socket.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 std::string GetSessionCacheKey() const OVERRIDE;
71 virtual bool InSessionCache() const OVERRIDE; 72 virtual bool InSessionCache() const OVERRIDE;
72 virtual void SetHandshakeCompletionCallback( 73 virtual void SetHandshakeCompletionCallback(
73 const base::Closure& callback) OVERRIDE; 74 const base::Closure& callback) OVERRIDE;
74 virtual void GetSSLCertRequestInfo( 75 virtual void GetSSLCertRequestInfo(
75 SSLCertRequestInfo* cert_request_info) OVERRIDE; 76 SSLCertRequestInfo* cert_request_info) OVERRIDE;
76 virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; 77 virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
77 78
78 // SSLSocket implementation. 79 // SSLSocket implementation.
79 virtual int ExportKeyingMaterial(const base::StringPiece& label, 80 virtual int ExportKeyingMaterial(const base::StringPiece& label,
80 bool has_context, 81 bool has_context,
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 // Added the following code Debugging in release mode. 214 // Added the following code Debugging in release mode.
214 mutable base::Lock lock_; 215 mutable base::Lock lock_;
215 // This is mutable so that CalledOnValidThread can set it. 216 // This is mutable so that CalledOnValidThread can set it.
216 // It's guarded by |lock_|. 217 // It's guarded by |lock_|.
217 mutable base::PlatformThreadId valid_thread_id_; 218 mutable base::PlatformThreadId valid_thread_id_;
218 }; 219 };
219 220
220 } // namespace net 221 } // namespace net
221 222
222 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 223 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698