| OLD | NEW |
| 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 int DoVerifyCT(int result); | 141 int DoVerifyCT(int result); |
| 142 int DoVerifyCTComplete(int result); | 142 int DoVerifyCTComplete(int result); |
| 143 | 143 |
| 144 void LogConnectionTypeMetrics() const; | 144 void LogConnectionTypeMetrics() const; |
| 145 | 145 |
| 146 // The following methods are for debugging bug 65948. Will remove this code | 146 // The following methods are for debugging bug 65948. Will remove this code |
| 147 // after fixing bug 65948. | 147 // after fixing bug 65948. |
| 148 void EnsureThreadIdAssigned() const; | 148 void EnsureThreadIdAssigned() const; |
| 149 bool CalledOnValidThread() const; | 149 bool CalledOnValidThread() const; |
| 150 | 150 |
| 151 void AddSCTInfoToSSLInfo(SSLInfo* ssl_info) const; |
| 152 |
| 151 // The task runner used to perform NSS operations. | 153 // The task runner used to perform NSS operations. |
| 152 scoped_refptr<base::SequencedTaskRunner> nss_task_runner_; | 154 scoped_refptr<base::SequencedTaskRunner> nss_task_runner_; |
| 153 scoped_ptr<ClientSocketHandle> transport_; | 155 scoped_ptr<ClientSocketHandle> transport_; |
| 154 HostPortPair host_and_port_; | 156 HostPortPair host_and_port_; |
| 155 SSLConfig ssl_config_; | 157 SSLConfig ssl_config_; |
| 156 | 158 |
| 157 scoped_refptr<Core> core_; | 159 scoped_refptr<Core> core_; |
| 158 | 160 |
| 159 CompletionCallback user_connect_callback_; | 161 CompletionCallback user_connect_callback_; |
| 160 | 162 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 // Added the following code Debugging in release mode. | 198 // Added the following code Debugging in release mode. |
| 197 mutable base::Lock lock_; | 199 mutable base::Lock lock_; |
| 198 // This is mutable so that CalledOnValidThread can set it. | 200 // This is mutable so that CalledOnValidThread can set it. |
| 199 // It's guarded by |lock_|. | 201 // It's guarded by |lock_|. |
| 200 mutable base::PlatformThreadId valid_thread_id_; | 202 mutable base::PlatformThreadId valid_thread_id_; |
| 201 }; | 203 }; |
| 202 | 204 |
| 203 } // namespace net | 205 } // namespace net |
| 204 | 206 |
| 205 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ | 207 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ |
| OLD | NEW |