Move crypto files out of base, to a top level directory.

crypto/nss_util.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // 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 "base/basictypes.h"
 
 #if defined(USE_NSS)
 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 {
-
-class Lock;
-class Time;
+namespace crypto {
 
 #if defined(USE_NSS)
 // EarlySetupForNSSInit performs lightweight setup which must occur before the
 // process goes multithreaded. This does not initialise NSS. For test, see
 // EnsureNSSInit.
 void EarlySetupForNSSInit();
 #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.
 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.

[wtc, 2011/04/07 05:35:53]

I believe EnsureNSSInit() no longer shuts down NSS on
program exit now.  Could you verify that and update this
comment?

Please also check if NSPR is shut down on program exit and
update the comment on lines 34-35 above if necessary.

[rvargas (doing something else), 2011/04/08 21:04:07]

Done.

 void EnsureNSSInit();
 
 // Call this before calling EnsureNSSInit() will force NSS to initialize
 // without a persistent DB.  This is used for the special case where access of
 // persistent DB is prohibited.
 //
 // TODO(hclam): Isolate loading default root certs.
 //
 // NSS will be initialized without loading any user security modules, including
 // the built-in root certificates module. User security modules need to be
@@ skipping 30 matching lines @@
 // A sample version string is "3.12.3".
 bool CheckNSSVersion(const char* version);
 
 #if defined(OS_CHROMEOS)
 // Open the r/w nssdb that's stored inside the user's encrypted home directory.
 void OpenPersistentNSSDB();
 #endif
 
 // 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
 // which the DB files will be placed.  |description| is a user-visible name for
 // the DB, as a utf8 string, which will be truncated at 32 bytes.
 bool OpenTestNSSDB(const FilePath& path, const char* description);
 void CloseTestNSSDB();
 
 // NSS has a bug which can cause a deadlock or stall in some cases when writing
 // to the certDB and keyDB. It also has a bug which causes concurrent key pair
@@ skipping 11 matching lines @@
  public:
   AutoNSSWriteLock();
   ~AutoNSSWriteLock();
  private:
   Lock *lock_;
   DISALLOW_COPY_AND_ASSIGN(AutoNSSWriteLock);
 };
 
 #endif  // defined(USE_NSS)
 
-}  // namespace base
+}  // namespace crypto
 
-#endif  // BASE_NSS_UTIL_H_
+#endif  // CRYPTO_NSS_UTIL_H_