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

Side by Side Diff: base/nss_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 | « base/native_library_win.cc ('k') | base/platform_file_win.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 "base/nss_util.h" 5 #include "base/nss_util.h"
6 #include "base/nss_util_internal.h" 6 #include "base/nss_util_internal.h"
7 7
8 #include <nss.h> 8 #include <nss.h>
9 #include <plarena.h> 9 #include <plarena.h>
10 #include <prerror.h> 10 #include <prerror.h>
11 #include <prinit.h> 11 #include <prinit.h>
12 #include <prtime.h> 12 #include <prtime.h>
13 #include <pk11pub.h> 13 #include <pk11pub.h>
14 #include <secmod.h> 14 #include <secmod.h>
15 15
16 #if defined(OS_LINUX) 16 #if defined(OS_LINUX)
17 #include <linux/nfs_fs.h> 17 #include <linux/nfs_fs.h>
18 #include <sys/vfs.h> 18 #include <sys/vfs.h>
19 #endif 19 #endif
20 20
21 #include "base/file_util.h" 21 #include "base/file_util.h"
22 #include "base/lazy_instance.h" 22 #include "base/lazy_instance.h"
23 #include "base/logging.h" 23 #include "base/logging.h"
24 #include "base/stringprintf.h" 24 #include "base/stringprintf.h"
25 #include "base/thread_restrictions.h" 25 #include "base/threading/thread_restrictions.h"
26 26
27 // USE_NSS means we use NSS for everything crypto-related. If USE_NSS is not 27 // USE_NSS means we use NSS for everything crypto-related. If USE_NSS is not
28 // defined, such as on Mac and Windows, we use NSS for SSL only -- we don't 28 // defined, such as on Mac and Windows, we use NSS for SSL only -- we don't
29 // use NSS for crypto or certificate verification, and we don't use the NSS 29 // use NSS for crypto or certificate verification, and we don't use the NSS
30 // certificate and key databases. 30 // certificate and key databases.
31 #if defined(USE_NSS) 31 #if defined(USE_NSS)
32 #include "base/environment.h" 32 #include "base/environment.h"
33 #include "base/lock.h" 33 #include "base/lock.h"
34 #include "base/scoped_ptr.h" 34 #include "base/scoped_ptr.h"
35 #endif // defined(USE_NSS) 35 #endif // defined(USE_NSS)
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 exploded.millisecond = prxtime.tm_usec / 1000; 387 exploded.millisecond = prxtime.tm_usec / 1000;
388 388
389 return Time::FromUTCExploded(exploded); 389 return Time::FromUTCExploded(exploded);
390 } 390 }
391 391
392 PK11SlotInfo* GetDefaultNSSKeySlot() { 392 PK11SlotInfo* GetDefaultNSSKeySlot() {
393 return g_nss_singleton.Get().GetDefaultKeySlot(); 393 return g_nss_singleton.Get().GetDefaultKeySlot();
394 } 394 }
395 395
396 } // namespace base 396 } // namespace base
OLDNEW
« no previous file with comments | « base/native_library_win.cc ('k') | base/platform_file_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698