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

Unified Diff: crypto/nss_util.h

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Chrome, webkit, remoting and crypto/owners Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
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_

Powered by Google App Engine
This is Rietveld 408576698