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

xfa/src/fgas/src/crt/fx_cpmgr.cpp

Index: xfa/src/fgas/src/crt/fx_cpmgr.cpp
diff --git a/xfa/src/fgas/src/crt/fx_cpmgr.cpp b/xfa/src/fgas/src/crt/fx_cpmgr.cpp
index 7bb2aa4a8d78b450137cbf56f94557f037936cbd..e57273d6148e6ce0659d00ee78b2ec1db316a2a1 100644
--- a/xfa/src/fgas/src/crt/fx_cpmgr.cpp
+++ b/xfa/src/fgas/src/crt/fx_cpmgr.cpp
@@ -41,10 +41,10 @@ extern const FX_CPCU_MAPINFO g_CP1257_CUMap;
 extern const FX_CPCU_MAPINFO g_CP1258_CUMap;
 FX_LPCCODEPAGE FX_GetCodePage(FX_WORD wCodePage)
 {
-    FX_INT32 iEnd = sizeof(g_FXCodePageMgr) / sizeof(FX_CODEPAGE) - 1;
+    int32_t iEnd = sizeof(g_FXCodePageMgr) / sizeof(FX_CODEPAGE) - 1;
     FXSYS_assert(iEnd >= 0);
-    FX_INT32 iStart = 0, iMid;
-    FX_UINT16 uCPID;
+    int32_t iStart = 0, iMid;
+    uint16_t uCPID;
     do {
         iMid = (iStart + iEnd) / 2;
         const FX_CODEPAGE &cp = g_FXCodePageMgr[iMid];