More DCHECK() updates. A mixture of _EQ and _GE.

base/win/scoped_variant.cc

 // 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.
 
 #include "base/win/scoped_variant.h"
 #include "base/logging.h"
 
 namespace base {
 namespace win {
 
@@ skipping 193 matching lines @@
   if (unk)
     unk->AddRef();
 }
 
 void ScopedVariant::Set(SAFEARRAY* array) {
   DCHECK(!IsLeakableVarType(var_.vt)) << "leaking variant: " << var_.vt;
   if (SUCCEEDED(::SafeArrayGetVartype(array, &var_.vt))) {
     var_.vt |= VT_ARRAY;
     var_.parray = array;
   } else {
-    DCHECK(array == NULL) << "Unable to determine safearray vartype";
+    DCHECK(!array) << "Unable to determine safearray vartype";
     var_.vt = VT_EMPTY;
   }
 }
 
 void ScopedVariant::Set(const VARIANT& var) {
   DCHECK(!IsLeakableVarType(var_.vt)) << "leaking variant: " << var_.vt;
   if (FAILED(::VariantCopy(&var_, &var))) {
     DLOG(ERROR) << "VariantCopy failed";
     var_.vt = VT_EMPTY;
   }
@@ skipping 42 matching lines @@
 
   if (!leakable && (vt & VT_ARRAY) != 0) {
     leakable = true;
   }
 
   return leakable;
 }
 
 }  // namespace win
 }  // namespace base