Text Encoding: Fix "stop on error" for ICU-based codecs

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 295 matching lines @@
 
 class ErrorCallbackSetter final {
     STACK_ALLOCATED();
 public:
     ErrorCallbackSetter(UConverter* converter, bool stopOnError)
         : m_converter(converter)
         , m_shouldStopOnEncodingErrors(stopOnError)
     {
         if (m_shouldStopOnEncodingErrors) {
             UErrorCode err = U_ZERO_ERROR;
-            ucnv_setToUCallBack(m_converter, UCNV_TO_U_CALLBACK_SUBSTITUTE,
-                UCNV_SUB_STOP_ON_ILLEGAL, &m_savedAction,
-                &m_savedContext, &err);
-            ASSERT(err == U_ZERO_ERROR);
+            ucnv_setToUCallBack(m_converter, UCNV_TO_U_CALLBACK_STOP, 0, &m_savedAction, &m_savedContext, &err);
+            DCHECK_EQ(err, U_ZERO_ERROR);
         }
     }
     ~ErrorCallbackSetter()
     {
         if (m_shouldStopOnEncodingErrors) {
             UErrorCode err = U_ZERO_ERROR;
             const void* oldContext;
             UConverterToUCallback oldAction;
             ucnv_setToUCallBack(m_converter, m_savedAction, m_savedContext, &oldAction, &oldContext, &err);
-            ASSERT(oldAction == UCNV_TO_U_CALLBACK_SUBSTITUTE);
-            ASSERT(!strcmp(static_cast<const char*>(oldContext), UCNV_SUB_STOP_ON_ILLEGAL));
-            ASSERT(err == U_ZERO_ERROR);
+            DCHECK_EQ(oldAction, UCNV_TO_U_CALLBACK_STOP);
+            DCHECK(!oldContext);
+            DCHECK_EQ(err, U_ZERO_ERROR);
         }
     }
 
 private:
     UConverter* m_converter;
     bool m_shouldStopOnEncodingErrors;
     const void* m_savedContext;
     UConverterToUCallback m_savedAction;
 };
 
@@ skipping 268 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