Merge to XFA: Remove the m_V5Type member variable from CPDF_Parser.

core/include/fpdfapi/fpdf_parser.h

Index: core/include/fpdfapi/fpdf_parser.h
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 62c2a8b1a114086ee96e3a20e80522b6eb629fe6..57120ec467226bb1c6f200a5174ff93948b4765a 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -430,18 +430,17 @@ class CPDF_Parser {
   CFX_ByteString m_Password;
 
   struct ObjectInfo {
-    ObjectInfo() : pos(0) {}
+    ObjectInfo() : pos(0), type(0) {}
 
     FX_FILESIZE pos;
-// TODO(thestig): Use fields below in place of |m_V5Type| and |m_ObjVersion|
-#if 0
     uint8_t type;
+// TODO(thestig): Use field below in place of |m_ObjVersion|
+#if 0
     uint16_t gennum;
 #endif
   };
   std::map<FX_DWORD, ObjectInfo> m_ObjectInfo;
 
-  CFX_ByteArray m_V5Type;
   CFX_WordArray m_ObjVersion;
   CFX_FileSizeArray m_SortedOffset;
   CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers;