Index: crypto/nss_util.h |
=================================================================== |
--- crypto/nss_util.h (revision 79901) |
+++ crypto/nss_util.h (working copy) |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef BASE_NSS_UTIL_H_ |
-#define BASE_NSS_UTIL_H_ |
+#ifndef CRYPTO_NSS_UTIL_H_ |
+#define CRYPTO_NSS_UTIL_H_ |
#pragma once |
#include <string> |
@@ -13,14 +13,16 @@ |
class FilePath; |
#endif // defined(USE_NSS) |
+namespace base { |
+class Lock; |
+class Time; |
+} // namespace base |
+ |
// This file specifically doesn't depend on any NSS or NSPR headers because it |
// is included by various (non-crypto) parts of chrome to call the |
// initialization functions. |
-namespace base { |
+namespace crypto { |
-class Lock; |
-class Time; |
- |
#if defined(USE_NSS) |
// EarlySetupForNSSInit performs lightweight setup which must occur before the |
// process goes multithreaded. This does not initialise NSS. For test, see |
@@ -29,13 +31,12 @@ |
#endif |
// Initialize NRPR if it isn't already initialized. This function is |
-// thread-safe, and NSPR will only ever be initialized once. NSPR will be |
-// properly shut down on program exit. |
+// thread-safe, and NSPR will only ever be initialized once. |
void EnsureNSPRInit(); |
// Initialize NSS if it isn't already initialized. This must be called before |
// any other NSS functions. This function is thread-safe, and NSS will only |
-// ever be initialized once. NSS will be properly shut down on program exit. |
+// ever be initialized once. |
void EnsureNSSInit(); |
// Call this before calling EnsureNSSInit() will force NSS to initialize |
@@ -97,7 +98,7 @@ |
// Convert a NSS PRTime value into a base::Time object. |
// We use a int64 instead of PRTime here to avoid depending on NSPR headers. |
-Time PRTimeToBaseTime(int64 prtime); |
+base::Time PRTimeToBaseTime(int64 prtime); |
#if defined(USE_NSS) |
// Exposed for unittests only. |path| should be an existing directory under |
@@ -129,6 +130,6 @@ |
#endif // defined(USE_NSS) |
-} // namespace base |
+} // namespace crypto |
-#endif // BASE_NSS_UTIL_H_ |
+#endif // CRYPTO_NSS_UTIL_H_ |