Merge to XFA: Get rid of most instance of 'foo != NULL'

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1512763013 .

(cherry picked from commit e3c7c2b54348da4a6939f6672f6c6bff126815a7)

Review URL: https://codereview.chromium.org/1529553003 .

1 files changed, 2 insertions, 5 deletions

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
index 857e19c28f..58b03c1887 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
@@ -161,7 +161,6 @@ CPDF_Array* CPDF_Object::GetArray() const {
   return const_cast<CPDF_Array*>(AsArray());
 }
 void CPDF_Object::SetString(const CFX_ByteString& str) {
-  ASSERT(this != NULL);
   switch (m_Type) {
     case PDFOBJ_BOOLEAN:
       AsBoolean()->m_bValue = (str == "true");
@@ -526,17 +525,15 @@ void CPDF_Array::SetAt(FX_DWORD i,
 void CPDF_Array::InsertAt(FX_DWORD index,
                           CPDF_Object* pObj,
                           CPDF_IndirectObjects* pObjs) {
-  ASSERT(pObj != NULL);
   if (pObj->GetObjNum()) {
-    ASSERT(pObjs != NULL);
+    ASSERT(pObjs);
     pObj = new CPDF_Reference(pObjs, pObj->GetObjNum());
   }
   m_Objects.InsertAt(index, pObj);
 }
 void CPDF_Array::Add(CPDF_Object* pObj, CPDF_IndirectObjects* pObjs) {
-  ASSERT(pObj != NULL);
   if (pObj->GetObjNum()) {
-    ASSERT(pObjs != NULL);
+    ASSERT(pObjs);
     pObj = new CPDF_Reference(pObjs, pObj->GetObjNum());
   }
   m_Objects.Add(pObj);