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

xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h

Index: xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
index 0bc71cdeb54c60f6941873e872325bca464faf10..2ec7b27aaab1060cb1c58beaebe80c86bda6eb9e 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
@@ -14,15 +14,15 @@ public:
     virtual ~CBC_ErrorCorrection();
     static void Initialize();
     static void Finalize();
-    static CFX_WideString encodeECC200(CFX_WideString codewords, CBC_SymbolInfo* symbolInfo, FX_INT32 &e);
+    static CFX_WideString encodeECC200(CFX_WideString codewords, CBC_SymbolInfo* symbolInfo, int32_t &e);
 private:
-    static FX_INT32 FACTOR_SETS[];
-    static FX_INT32 FACTORS[][100];
-    static FX_INT32 MODULO_VALUE;
-    static FX_INT32 LOG[256];
-    static FX_INT32 ALOG[256];
+    static int32_t FACTOR_SETS[];
+    static int32_t FACTORS[][100];
+    static int32_t MODULO_VALUE;
+    static int32_t LOG[256];
+    static int32_t ALOG[256];
 private:
-    static CFX_WideString createECCBlock(CFX_WideString codewords, FX_INT32 numECWords, FX_INT32 &e);
-    static CFX_WideString createECCBlock(CFX_WideString codewords, FX_INT32 start, FX_INT32 len, FX_INT32 numECWords, FX_INT32 &e);
+    static CFX_WideString createECCBlock(CFX_WideString codewords, int32_t numECWords, int32_t &e);
+    static CFX_WideString createECCBlock(CFX_WideString codewords, int32_t start, int32_t len, int32_t numECWords, int32_t &e);
 };
 #endif