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

xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h

Index: xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
index 81fd6b79e9347d1410b47b4680eb981bc3aabb4d..3e7db70f9541d79b30264a3e43e5e576a7fbe291 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
@@ -14,19 +14,19 @@ class CBC_OnedCode39Reader : public CBC_OneDReader
 public:
     static FX_LPCSTR ALPHABET_STRING;
     static FX_LPCSTR CHECKSUM_STRING;
-    const static FX_INT32 CHARACTER_ENCODINGS[44];
-    const static FX_INT32 ASTERISK_ENCODING;
+    const static int32_t CHARACTER_ENCODINGS[44];
+    const static int32_t ASTERISK_ENCODING;
     CBC_OnedCode39Reader();
     CBC_OnedCode39Reader(FX_BOOL usingCheckDigit);
     CBC_OnedCode39Reader(FX_BOOL usingCheckDigit, FX_BOOL extendedMode);
     virtual ~CBC_OnedCode39Reader();
-    CFX_ByteString DecodeRow(FX_INT32 rowNumber, CBC_CommonBitArray *row, FX_INT32 hints, FX_INT32 &e);
+    CFX_ByteString DecodeRow(int32_t rowNumber, CBC_CommonBitArray *row, int32_t hints, int32_t &e);
 private:
     FX_BOOL m_usingCheckDigit;
     FX_BOOL m_extendedMode;
-    CFX_Int32Array *FindAsteriskPattern(CBC_CommonBitArray *row, FX_INT32 &e);
-    FX_INT32 ToNarrowWidePattern(CFX_Int32Array *counters);
-    FX_CHAR PatternToChar(FX_INT32 pattern, FX_INT32 &e);
-    CFX_ByteString DecodeExtended(CFX_ByteString &encoded, FX_INT32 &e);
+    CFX_Int32Array *FindAsteriskPattern(CBC_CommonBitArray *row, int32_t &e);
+    int32_t ToNarrowWidePattern(CFX_Int32Array *counters);
+    FX_CHAR PatternToChar(int32_t pattern, int32_t &e);
+    CFX_ByteString DecodeExtended(CFX_ByteString &encoded, int32_t &e);
 };
 #endif