Unify usage of logging/assert macros in base/

base/memory/weak_ptr_unittest.cc

 // 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.
 
 #include "base/memory/weak_ptr.h"
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 545 matching lines @@
   // Main thread creates an arrow referencing the Target.
   Arrow* arrow = new Arrow();
   arrow->target = target.AsWeakPtr();
 
   // Background can delete arrow (as well as the WeakPtr inside).
   BackgroundThread background;
   background.Start();
   background.DeleteArrow(arrow);
 }
 
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
+#if DCHECK_IS_ON() && GTEST_HAS_DEATH_TEST
 
 TEST(WeakPtrDeathTest, WeakPtrCopyDoesNotChangeThreadBinding) {
   // The default style "fast" does not support multi-threaded tests
   // (introduces deadlock on Linux).
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
 
   BackgroundThread background;
   background.Start();
 
   // Main thread creates a Target object.
@@ skipping 95 matching lines @@
   background.Start();
   background.DeleteTarget(target.release());
 
   // Main thread attempts to dereference the target, violating thread binding.
   ASSERT_DEATH(arrow.target.get(), "");
 }
 
 #endif
 
 }  // namespace base