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

xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h

Index: xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
index d5697ff7249f958929a32287d6d9df8c1dad903d..4502398e92f5110929486c3d3239faa4ef62ac1d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
@@ -13,14 +13,14 @@ class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRDataBlock
 {
 private:
-    FX_INT32 m_numDataCodewords;
+    int32_t m_numDataCodewords;
     CFX_ByteArray *m_codewords;
-    CBC_QRDataBlock(FX_INT32 numDataCodewords, CFX_ByteArray *codewords);
+    CBC_QRDataBlock(int32_t numDataCodewords, CFX_ByteArray *codewords);
 public:
     virtual ~CBC_QRDataBlock();
-    FX_INT32 GetNumDataCodewords();
+    int32_t GetNumDataCodewords();
     CFX_ByteArray* GetCodewords();
     static CFX_PtrArray *GetDataBlocks(CFX_ByteArray* rawCodewords,
-                                       CBC_QRCoderVersion *version, CBC_QRCoderErrorCorrectionLevel* ecLevel, FX_INT32 &e);
+                                       CBC_QRCoderVersion *version, CBC_QRCoderErrorCorrectionLevel* ecLevel, int32_t &e);
 };
 #endif