Revert 48186, 48196, 48198

base/crypto/scoped_capi_types.h

 // Copyright (c) 2010 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_CRYPTO_SCOPED_CAPI_TYPES_H_
 #define BASE_CRYPTO_SCOPED_CAPI_TYPES_H_
 
 #include <windows.h>
 #include <wincrypt.h>
 
@@ skipping 46 matching lines @@
     if (handle_ != handle) {
       free_(handle_);
       handle_ = handle;
     }
   }
 
   operator CAPIHandle() const { return handle_; }
   CAPIHandle get() const { return handle_; }
 
   CAPIHandle* receive() {
-    CHECK(handle_ == NULL);
+    CHECK_EQ(NULL, handle_);
     return &handle_;
   }
 
   bool operator==(CAPIHandle handle) const {
     return handle_ == handle;
   }
 
   bool operator!=(CAPIHandle handle) const {
     return handle_ != handle;
   }
@@ skipping 37 matching lines @@
 
 typedef ScopedCAPIHandle<
     HCRYPTKEY, CAPIDestroyer<HCRYPTKEY, CryptDestroyKey> > ScopedHCRYPTKEY;
 
 typedef ScopedCAPIHandle<
     HCRYPTHASH, CAPIDestroyer<HCRYPTHASH, CryptDestroyHash> > ScopedHCRYPTHASH;
 
 }  // namespace base
 
 #endif  // BASE_CRYPTO_SCOPED_CAPI_TYPES_H_