Merge to XFA: Use stdint.h types throughout PDFium.

xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h

Index: xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index 7639c032bacf46b20816eafa5e620bd9a1ac40e8..d635137e9da6bfae90f8d15a9088d8a0c906bb0c 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
@@ -11,8 +11,8 @@ class CBC_PDF417ResultMetadata
 public:
     CBC_PDF417ResultMetadata();
     virtual ~CBC_PDF417ResultMetadata();
-    FX_INT32 getSegmentIndex();
-    void setSegmentIndex(FX_INT32 segmentIndex);
+    int32_t getSegmentIndex();
+    void setSegmentIndex(int32_t segmentIndex);
     CFX_ByteString getFileId();
     void setFileId(CFX_ByteString fileId);
     CFX_Int32Array& getOptionalData();
@@ -20,7 +20,7 @@ public:
     FX_BOOL isLastSegment();
     void setLastSegment(FX_BOOL lastSegment);
 private:
-    FX_INT32 m_segmentIndex;
+    int32_t m_segmentIndex;
     CFX_ByteString m_fileId;
     CFX_Int32Array m_optionalData;
     FX_BOOL m_lastSegment;