Deprecate some macros in wtf/Assertions.h in favor of base/logging.h

third_party/WebKit/Source/wtf/text/TextCodecICU.cpp

 /*
  * Copyright (C) 2004, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 271 matching lines @@
         const char* cachedName = ucnv_getName(cachedConverter, &err);
         if (U_SUCCESS(err) && m_encoding == cachedName) {
             m_converterICU = cachedConverter;
             cachedConverter = 0;
             return;
         }
     }
 
     err = U_ZERO_ERROR;
     m_converterICU = ucnv_open(m_encoding.name(), &err);
-#if !LOG_DISABLED
-    if (err == U_AMBIGUOUS_ALIAS_WARNING)
-        WTF_LOG_ERROR("ICU ambiguous alias warning for encoding: %s", m_encoding.name());
-#endif
+    DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING) << "ICU ambiguous alias warning for encoding: " << m_encoding.name();
     if (m_converterICU)
         ucnv_setFallback(m_converterICU, TRUE);
 }
 
 int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
 {
     UChar* targetStart = target;
     err = U_ZERO_ERROR;
     ucnv_toUnicode(m_converterICU, &target, targetLimit, &source, sourceLimit, offsets, flush, &err);
     return target - targetStart;
@@ skipping 34 matching lines @@
     UConverterToUCallback m_savedAction;
 };
 
 String TextCodecICU::decode(const char* bytes, size_t length, FlushBehavior flush, bool stopOnError, bool& sawError)
 {
     // Get a converter for the passed-in encoding.
     if (!m_converterICU) {
         createICUConverter();
         ASSERT(m_converterICU);
         if (!m_converterICU) {
-            WTF_LOG_ERROR("error creating ICU encoder even though encoding was in table");
+            DLOG(ERROR) << "error creating ICU encoder even though encoding was in table";
             return String();
         }
     }
 
     ErrorCallbackSetter callbackSetter(m_converterICU, stopOnError);
 
     StringBuilder result;
 
     UChar buffer[ConversionBufferSize];
     UChar* bufferLimit = buffer + ConversionBufferSize;
@@ skipping 211 matching lines @@
 {
     return encodeCommon(characters, length, handling);
 }
 
 CString TextCodecICU::encode(const LChar* characters, size_t length, UnencodableHandling handling)
 {
     return encodeCommon(characters, length, handling);
 }
 
 } // namespace WTF