Remove the m_V5Type member variable from CPDF_Parser.

core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp

 // Copyright 2015 PDFium 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 "core/include/fpdfapi/fpdf_parser.h"
 #include "core/include/fxcrt/fx_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/utils/path_service.h"
 
 // Functions to help test an array's content against expected results.
@@ skipping 272 matching lines @@
         "0000000331 00000 n \n"
         "0000000409 00000 n \n"
         "trail";  // Needed to end cross ref table reading.
     CPDF_TestParser parser;
     ASSERT_TRUE(
         parser.InitTestFromBuffer(xref_table, FX_ArraySize(xref_table)));
 
     ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, FALSE));
     const FX_FILESIZE offsets[] = {0, 17, 81, 0, 331, 409};
     const uint8_t types[] = {0, 1, 1, 0, 1, 1};
-    for (size_t i = 0; i < FX_ArraySize(offsets); ++i)
+    for (size_t i = 0; i < FX_ArraySize(offsets); ++i) {
       EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
-    ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types)));
+      EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type);
+    }
   }
   {
     const unsigned char xref_table[] =
         "xref \n"
         "0 1 \n"
         "0000000000 65535 f \n"
         "3 1 \n"
         "0000025325 00000 n \n"
         "8 2 \n"
         "0000025518 00002 n \n"
         "0000025635 00000 n \n"
         "12 1 \n"
         "0000025777 00000 n \n"
         "trail";  // Needed to end cross ref table reading.
     CPDF_TestParser parser;
     ASSERT_TRUE(
         parser.InitTestFromBuffer(xref_table, FX_ArraySize(xref_table)));
 
     ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, FALSE));
     const FX_FILESIZE offsets[] = {0, 0,     0,     25325, 0, 0,    0,
                                    0, 25518, 25635, 0,     0, 25777};
     const uint8_t types[] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1};
-    for (size_t i = 0; i < FX_ArraySize(offsets); ++i)
+    for (size_t i = 0; i < FX_ArraySize(offsets); ++i) {
       EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
-    ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types)));
+      EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type);
+    }
   }
   {
     const unsigned char xref_table[] =
         "xref \n"
         "0 1 \n"
         "0000000000 65535 f \n"
         "3 1 \n"
         "0000025325 00000 n \n"
         "8 2 \n"
         "0000000000 65535 f \n"
         "0000025635 00000 n \n"
         "12 1 \n"
         "0000025777 00000 n \n"
         "trail";  // Needed to end cross ref table reading.
     CPDF_TestParser parser;
     ASSERT_TRUE(
         parser.InitTestFromBuffer(xref_table, FX_ArraySize(xref_table)));
 
     ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, FALSE));
     const FX_FILESIZE offsets[] = {0, 0, 0,     25325, 0, 0,    0,
                                    0, 0, 25635, 0,     0, 25777};
     const uint8_t types[] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1};
-    for (size_t i = 0; i < FX_ArraySize(offsets); ++i)
+    for (size_t i = 0; i < FX_ArraySize(offsets); ++i) {
       EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
-    ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types)));
+      EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type);
+    }
   }
   {
     const unsigned char xref_table[] =
         "xref \n"
         "0 7 \n"
         "0000000002 65535 f \n"
         "0000000023 00000 n \n"
         "0000000003 65535 f \n"
         "0000000004 65535 f \n"
         "0000000000 65535 f \n"
         "0000000045 00000 n \n"
         "0000000179 00000 n \n"
         "trail";  // Needed to end cross ref table reading.
     CPDF_TestParser parser;
     ASSERT_TRUE(
         parser.InitTestFromBuffer(xref_table, FX_ArraySize(xref_table)));
 
     ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, FALSE));
     const FX_FILESIZE offsets[] = {0, 23, 0, 0, 0, 45, 179};
     const uint8_t types[] = {0, 1, 0, 0, 0, 1, 1};
-    for (size_t i = 0; i < FX_ArraySize(offsets); ++i)
+    for (size_t i = 0; i < FX_ArraySize(offsets); ++i) {
       EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
-    ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types)));
+      EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type);
+    }
   }
 }