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

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

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « net/quic/test_tools/quic_test_utils.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>
11 #include <nss.h> 11 #include <nss.h>
12 12
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/synchronization/lock.h" 17 #include "base/synchronization/lock.h"
18 #include "base/threading/platform_thread.h" 18 #include "base/threading/platform_thread.h"
19 #include "base/time/time.h" 19 #include "base/time/time.h"
20 #include "base/timer/timer.h"
21 #include "net/base/completion_callback.h" 20 #include "net/base/completion_callback.h"
22 #include "net/base/host_port_pair.h" 21 #include "net/base/host_port_pair.h"
23 #include "net/base/net_export.h" 22 #include "net/base/net_export.h"
24 #include "net/base/net_log.h" 23 #include "net/base/net_log.h"
25 #include "net/base/nss_memio.h" 24 #include "net/base/nss_memio.h"
26 #include "net/cert/cert_verify_result.h" 25 #include "net/cert/cert_verify_result.h"
27 #include "net/cert/ct_verify_result.h" 26 #include "net/cert/ct_verify_result.h"
28 #include "net/cert/x509_certificate.h" 27 #include "net/cert/x509_certificate.h"
29 #include "net/socket/ssl_client_socket.h" 28 #include "net/socket/ssl_client_socket.h"
30 #include "net/ssl/channel_id_service.h" 29 #include "net/ssl/channel_id_service.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 // Added the following code Debugging in release mode. 211 // Added the following code Debugging in release mode.
213 mutable base::Lock lock_; 212 mutable base::Lock lock_;
214 // This is mutable so that CalledOnValidThread can set it. 213 // This is mutable so that CalledOnValidThread can set it.
215 // It's guarded by |lock_|. 214 // It's guarded by |lock_|.
216 mutable base::PlatformThreadId valid_thread_id_; 215 mutable base::PlatformThreadId valid_thread_id_;
217 }; 216 };
218 217
219 } // namespace net 218 } // namespace net
220 219
221 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 220 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/quic/test_tools/quic_test_utils.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698