chromium/src
0
Fork 0
Code Activity

Fix up #ifdefs in crypto/encryptor.h.

Browse Source 
This was causing scoped_nss_types.h to be incorrectly included in the chimera
build. (No actual consequence. The header is legal in the chimera, it's just
unnecessary.)

BUG=none

Review URL: https://codereview.chromium.org/1281033003

Cr-Commit-Position: refs/heads/master@{#342938}
This commit is contained in:
davidben
2015-08-11 16:41:54 -07:00
committed by Commit bot
parent 83b2aa790b
commit 591b117f69
1 changed files with 2 additions and 3 deletions

5
crypto/encryptor.h

@ -13,8 +13,7 @@
#include "build/build_config.h"
#include "crypto/crypto_export.h"
#if defined(USE_NSS_CERTS) || \
(!defined(USE_OPENSSL) && (defined(OS_WIN) || defined(OS_MACOSX)))
#if !defined(USE_OPENSSL)
#include "crypto/scoped_nss_types.h"
#endif
@ -122,7 +121,7 @@ class CRYPTO_EXPORT Encryptor {
const base::StringPiece& input,
std::string* output);
std::string iv_;
#elif defined(USE_NSS_CERTS) || defined(OS_WIN) || defined(OS_MACOSX)
#else
bool Crypt(PK11Context* context,
const base::StringPiece& input,
std::string* output);