| Index: chrome/utility/importer/nss_decryptor.cc
|
| diff --git a/chrome/utility/importer/nss_decryptor.cc b/chrome/utility/importer/nss_decryptor.cc
|
| index 8e9d85f2d6cf8b6bd8dd022aa1176fc501b64b0f..6d6d676211dbdbb27f4a4d2d8fc2ea10d1683989 100644
|
| --- a/chrome/utility/importer/nss_decryptor.cc
|
| +++ b/chrome/utility/importer/nss_decryptor.cc
|
| @@ -16,10 +16,10 @@
|
| #include "sql/connection.h"
|
| #include "sql/statement.h"
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| #include <pk11pub.h>
|
| #include <pk11sdr.h>
|
| -#endif // defined(USE_NSS)
|
| +#endif // defined(USE_NSS_CERTS)
|
|
|
| // This method is based on some Firefox code in
|
| // security/manager/ssl/src/nsSDR.cpp
|
| @@ -90,11 +90,11 @@ base::string16 NSSDecryptor::Decrypt(const std::string& crypt) const {
|
| SECItem reply;
|
| reply.data = NULL;
|
| reply.len = 0;
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| result = PK11SDR_DecryptWithSlot(slot, &request, &reply, NULL);
|
| #else
|
| result = PK11SDR_Decrypt(&request, &reply, NULL);
|
| -#endif // defined(USE_NSS)
|
| +#endif // defined(USE_NSS_CERTS)
|
| if (result == SECSuccess)
|
| plain.assign(reinterpret_cast<char*>(reply.data), reply.len);
|
|
|
|
|