Unify usage of logging/assert macros in base/

base/i18n/icu_util.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/i18n/icu_util.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 30 matching lines @@
 
 #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED
 #define ICU_UTIL_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
 #if defined(OS_WIN)
 #define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt.dll"
 #endif
 #endif
 
 namespace {
 #if !defined(OS_NACL)
-#if !defined(NDEBUG)
+#if DCHECK_IS_ON()
 // Assert that we are not called more than once.  Even though calling this
 // function isn't harmful (ICU can handle it), being called twice probably
 // indicates a programming error.
 bool g_check_called_once = true;
 bool g_called_once = false;
 #endif  // !defined(NDEBUG)

[danakj, 2016/07/19 20:17:01]

fix this

[gab, 2016/07/20 02:43:58]

Done.

 
 #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
 
 // To debug http://crbug.com/445616.
 int g_debug_icu_last_error;
 int g_debug_icu_load;
 int g_debug_icu_pf_error_details;
 int g_debug_icu_pf_last_error;
 #if defined(OS_WIN)
 wchar_t g_debug_icu_pf_filename[_MAX_PATH];
@@ skipping 126 matching lines @@
 #endif  // !defined(OS_NACL)
 
 }  // namespace
 
 #if !defined(OS_NACL)
 #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
 #if defined(OS_ANDROID)
 bool InitializeICUWithFileDescriptor(
     PlatformFile data_fd,
     const MemoryMappedFile::Region& data_region) {
-#if !defined(NDEBUG)
+#if DCHECK_IS_ON()
   DCHECK(!g_check_called_once || !g_called_once);
   g_called_once = true;
 #endif
   return InitializeICUWithFileDescriptorInternal(data_fd, data_region);
 }
 
 PlatformFile GetIcuDataFileHandle(MemoryMappedFile::Region* out_region) {
   CHECK_NE(g_icudtl_pf, kInvalidPlatformFile);
   *out_region = g_icudtl_region;
   return g_icudtl_pf;
 }
 #endif
 
 const uint8_t* GetRawIcuMemory() {
   CHECK(g_icudtl_mapped_file);
   return g_icudtl_mapped_file->data();
 }
 
 bool InitializeICUFromRawMemory(const uint8_t* raw_memory) {
 #if !defined(COMPONENT_BUILD)
-#if !defined(NDEBUG)
+#if DCHECK_IS_ON()
   DCHECK(!g_check_called_once || !g_called_once);
   g_called_once = true;
 #endif
 
   UErrorCode err = U_ZERO_ERROR;
   udata_setCommonData(const_cast<uint8_t*>(raw_memory), &err);
   return err == U_ZERO_ERROR;
 #else
   return true;
 #endif
 }
 
 #endif  // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
 
 bool InitializeICU() {
-#if !defined(NDEBUG)
+#if DCHECK_IS_ON()
   DCHECK(!g_check_called_once || !g_called_once);
   g_called_once = true;
 #endif
 
   bool result;
 #if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED)
   // We expect to find the ICU data module alongside the current module.
   FilePath data_path;
   PathService::Get(DIR_MODULE, &data_path);
   data_path = data_path.AppendASCII(ICU_UTIL_DATA_SHARED_MODULE_NAME);
@@ skipping 48 matching lines @@
 // when requested.
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   if (result)
     std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
 #endif
   return result;
 }
 #endif  // !defined(OS_NACL)
 
 void AllowMultipleInitializeCallsForTesting() {
-#if !defined(NDEBUG) && !defined(OS_NACL)
+#if DCHECK_IS_ON() && !defined(OS_NACL)
   g_check_called_once = false;
 #endif
 }
 
 }  // namespace i18n
 }  // namespace base