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

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

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/proxy/sync_host_resolver_bridge_unittest.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "net/socket/nss_ssl_util.h" 5 #include "net/socket/nss_ssl_util.h"
6 6
7 #include <nss.h> 7 #include <nss.h>
8 #include <secerr.h> 8 #include <secerr.h>
9 #include <ssl.h> 9 #include <ssl.h>
10 #include <sslerr.h> 10 #include <sslerr.h>
11 11
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/nss_util.h" 14 #include "base/nss_util.h"
15 #include "base/singleton.h" 15 #include "base/singleton.h"
16 #include "base/thread_restrictions.h" 16 #include "base/threading/thread_restrictions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
19 #include "net/base/net_log.h" 19 #include "net/base/net_log.h"
20 20
21 namespace net { 21 namespace net {
22 22
23 class NSSSSLInitSingleton { 23 class NSSSSLInitSingleton {
24 public: 24 public:
25 NSSSSLInitSingleton() { 25 NSSSSLInitSingleton() {
26 base::EnsureNSSInit(); 26 base::EnsureNSSInit();
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 void LogFailedNSSFunction(const BoundNetLog& net_log, 232 void LogFailedNSSFunction(const BoundNetLog& net_log,
233 const char* function, 233 const char* function,
234 const char* param) { 234 const char* param) {
235 net_log.AddEvent( 235 net_log.AddEvent(
236 NetLog::TYPE_SSL_NSS_ERROR, 236 NetLog::TYPE_SSL_NSS_ERROR,
237 make_scoped_refptr(new SSLFailedNSSFunctionParams(function, param))); 237 make_scoped_refptr(new SSLFailedNSSFunctionParams(function, param)));
238 } 238 }
239 239
240 } // namespace net 240 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/sync_host_resolver_bridge_unittest.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698