Fix a few warnings that -Wnull-conversion of a future clang will complain about.

crypto/cssm_init.cc

 // 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.
 
 #include "crypto/cssm_init.h"
 
 #include <Security/SecBase.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 32 matching lines @@
                      LeakySingletonTraits<CSSMInitSingleton> >::get();
   }
 
   CSSM_CSP_HANDLE csp_handle() const { return csp_handle_; }
   CSSM_CL_HANDLE cl_handle() const { return cl_handle_; }
   CSSM_TP_HANDLE tp_handle() const { return tp_handle_; }
 
  private:
   CSSMInitSingleton()
       : inited_(false), csp_loaded_(false), cl_loaded_(false),
-        tp_loaded_(false), csp_handle_(NULL), cl_handle_(NULL),
-        tp_handle_(NULL) {
+        tp_loaded_(false), csp_handle_(CSSM_INVALID_HANDLE),
+        cl_handle_(CSSM_INVALID_HANDLE), tp_handle_(CSSM_INVALID_HANDLE) {
     static CSSM_VERSION version = {2, 0};
     // TODO(wtc): what should our caller GUID be?
     static const CSSM_GUID test_guid = {
       0xFADE, 0, 0, { 1, 2, 3, 4, 5, 6, 7, 0 }
     };
     CSSM_RETURN crtn;
     CSSM_PVC_MODE pvc_policy = CSSM_PVC_NONE;
     crtn = CSSM_Init(&version, CSSM_PRIVILEGE_SCOPE_NONE, &test_guid,
                      CSSM_KEY_HIERARCHY_NONE, &pvc_policy, NULL);
     if (crtn) {
@@ skipping 130 matching lines @@
 }
 
 ScopedCSSMData::~ScopedCSSMData() {
   if (data_.Data) {
     CSSMFree(data_.Data);
     data_.Data = NULL;
   }
 }
 
 }  // namespace crypto