Unify usage of logging/assert macros in base/

base/android/build_info.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/android/build_info.h"
 
 #include <string>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
@@ skipping 20 matching lines @@
   static BuildInfo* New() {
     return new BuildInfo(AttachCurrentThread());
   }
 
   static void Delete(BuildInfo* x) {
     // We're leaking this type, see kRegisterAtExit.
     NOTREACHED();
   }
 
   static const bool kRegisterAtExit = false;
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
   static const bool kAllowedToAccessOnNonjoinableThread = true;
 #endif
 };
 
 BuildInfo::BuildInfo(JNIEnv* env)
     : device_(StrDupJString(Java_BuildInfo_getDevice(env))),
       manufacturer_(StrDupJString(Java_BuildInfo_getDeviceManufacturer(env))),
       model_(StrDupJString(Java_BuildInfo_getDeviceModel(env))),
       brand_(StrDupJString(Java_BuildInfo_getBrand(env))),
       android_build_id_(StrDupJString(Java_BuildInfo_getAndroidBuildId(env))),
@@ skipping 29 matching lines @@
   java_exception_info_ = nullptr;
 }
 
 // static
 bool BuildInfo::RegisterBindings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace base