Standardize on ASSERT.

There are currently three ways to assert in the code (ASSERT, FXSYS_assert and
assert). This CL standardizes on ASSERT. The benefit of ASSERT is that it can
be overridden if the platform requies and we can pickup the Chromium version
if it has already been defined in the build.

This does change behaviour. Currently FXSYS_assert is always defined but ASSERT
is only defined in debug builds. So, the FXSYS_assert's would fire in Release
builds. That will no longer happen.

BUG=pdfium:219

Review-Url: https://codereview.chromium.org/1914303003

1 files changed, 9 insertions, 9 deletions

diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h
index 8a66dd9e93..95de85bde6 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.h
+++ b/xfa/fgas/layout/fgas_rtfbreak.h
@@ -115,7 +115,7 @@ class CFX_RTFPiece : public CFX_Target {
         m_pUserData(NULL) {}
   ~CFX_RTFPiece() { Reset(); }
   void AppendChar(const CFX_RTFChar& tc) {
-    FXSYS_assert(m_pChars != NULL);
+    ASSERT(m_pChars != NULL);
     m_pChars->Add(tc);
     if (m_iWidth < 0) {
       m_iWidth = tc.m_iCharWidth;
@@ -130,15 +130,15 @@ class CFX_RTFPiece : public CFX_Target {
   int32_t GetLength() const { return m_iChars; }
   int32_t GetEndChar() const { return m_iStartChar + m_iChars; }
   CFX_RTFChar& GetChar(int32_t index) {
-    FXSYS_assert(index > -1 && index < m_iChars && m_pChars != NULL);
+    ASSERT(index > -1 && index < m_iChars && m_pChars != NULL);
     return *m_pChars->GetDataPtr(m_iStartChar + index);
   }
   CFX_RTFChar* GetCharPtr(int32_t index) const {
-    FXSYS_assert(index > -1 && index < m_iChars && m_pChars != NULL);
+    ASSERT(index > -1 && index < m_iChars && m_pChars != NULL);
     return m_pChars->GetDataPtr(m_iStartChar + index);
   }
   void GetString(FX_WCHAR* pText) const {
-    FXSYS_assert(pText != NULL);
+    ASSERT(pText != NULL);
     int32_t iEndChar = m_iStartChar + m_iChars;
     CFX_RTFChar* pChar;
     for (int32_t i = m_iStartChar; i < iEndChar; i++) {
@@ -152,7 +152,7 @@ class CFX_RTFPiece : public CFX_Target {
     wsText.ReleaseBuffer(m_iChars);
   }
   void GetWidths(int32_t* pWidths) const {
-    FXSYS_assert(pWidths != NULL);
+    ASSERT(pWidths != NULL);
     int32_t iEndChar = m_iStartChar + m_iChars;
     CFX_RTFChar* pChar;
     for (int32_t i = m_iStartChar; i < iEndChar; i++) {
@@ -202,20 +202,20 @@ class CFX_RTFLine {
   ~CFX_RTFLine() { RemoveAll(); }
   int32_t CountChars() const { return m_LineChars.GetSize(); }
   CFX_RTFChar& GetChar(int32_t index) {
-    FXSYS_assert(index > -1 && index < m_LineChars.GetSize());
+    ASSERT(index > -1 && index < m_LineChars.GetSize());
     return *m_LineChars.GetDataPtr(index);
   }
   CFX_RTFChar* GetCharPtr(int32_t index) {
-    FXSYS_assert(index > -1 && index < m_LineChars.GetSize());
+    ASSERT(index > -1 && index < m_LineChars.GetSize());
     return m_LineChars.GetDataPtr(index);
   }
   int32_t CountPieces() const { return m_LinePieces.GetSize(); }
   CFX_RTFPiece& GetPiece(int32_t index) const {
-    FXSYS_assert(index > -1 && index < m_LinePieces.GetSize());
+    ASSERT(index > -1 && index < m_LinePieces.GetSize());
     return m_LinePieces.GetAt(index);
   }
   CFX_RTFPiece* GetPiecePtr(int32_t index) const {
-    FXSYS_assert(index > -1 && index < m_LinePieces.GetSize());
+    ASSERT(index > -1 && index < m_LinePieces.GetSize());
     return m_LinePieces.GetPtrAt(index);
   }
   int32_t GetLineEnd() const { return m_iStart + m_iWidth; }