Fix up #ifdefs in crypto/encryptor.h.

crypto/encryptor.h

 // Copyright (c) 2012 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 CRYPTO_ENCRYPTOR_H_
 #define CRYPTO_ENCRYPTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #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
 
 namespace crypto {
 
 class SymmetricKey;
 
 class CRYPTO_EXPORT Encryptor {
  public:
   enum Mode {
@@ skipping 87 matching lines @@
   scoped_ptr<Counter> counter_;
 
 #if defined(USE_OPENSSL)
   bool Crypt(bool do_encrypt,  // Pass true to encrypt, false to decrypt.
              const base::StringPiece& input,
              std::string* output);
   bool CryptCTR(bool do_encrypt,
                 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);
   bool CryptCTR(PK11Context* context,
                 const base::StringPiece& input,
                 std::string* output);
   ScopedSECItem param_;
 #endif
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_ENCRYPTOR_H_