| Index: crypto/nss_util.h
|
| ===================================================================
|
| --- crypto/nss_util.h (revision 79901)
|
| +++ crypto/nss_util.h (working copy)
|
| @@ -1,9 +1,9 @@
|
| -// 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"
|
| @@ -12,14 +12,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
|
| @@ -85,7 +87,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
|
| @@ -117,6 +119,6 @@
|
|
|
| #endif // defined(USE_NSS)
|
|
|
| -} // namespace base
|
| +} // namespace crypto
|
|
|
| -#endif // BASE_NSS_UTIL_H_
|
| +#endif // CRYPTO_NSS_UTIL_H_
|
|
|