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

xfa/src/fxbarcode/common/BC_CommonDecoderResult.h

Index: xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
index 5f41afc774c8118c1a0e2a8daf03cd08604c4796..e85317934a26465bbc4f1b5fd28fe6e30eabaa8f 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
@@ -17,8 +17,8 @@ public:
     const CFX_ByteString& GetText();
     const CFX_Int32Array& GetByteSegments();
     CBC_QRCoderErrorCorrectionLevel* GetECLevel();
-    virtual void Init(const CFX_ByteArray &rawBytes, const CFX_ByteString &text, const CFX_Int32Array &byteSegments, CBC_QRCoderErrorCorrectionLevel* ecLevel, FX_INT32 &e);
-    virtual void Init(const CFX_ByteArray &rawBytes, const CFX_ByteString &text, const CFX_PtrArray &byteSegments, const CFX_ByteString &ecLevel, FX_INT32 &e);
+    virtual void Init(const CFX_ByteArray &rawBytes, const CFX_ByteString &text, const CFX_Int32Array &byteSegments, CBC_QRCoderErrorCorrectionLevel* ecLevel, int32_t &e);
+    virtual void Init(const CFX_ByteArray &rawBytes, const CFX_ByteString &text, const CFX_PtrArray &byteSegments, const CFX_ByteString &ecLevel, int32_t &e);
     void setOther(CBC_PDF417ResultMetadata* other);
 private:
     CFX_ByteArray m_rawBytes;