Switch to standard integer types in base/strings/.

base/strings/utf_string_conversions.cc

Index: base/strings/utf_string_conversions.cc
diff --git a/base/strings/utf_string_conversions.cc b/base/strings/utf_string_conversions.cc
index b6cf6ff9b101446d026484df7e1c569fcec434bf..6b17eacd6ce9b870b25a17270f81f71822a11496 100644
--- a/base/strings/utf_string_conversions.cc
+++ b/base/strings/utf_string_conversions.cc
@@ -4,9 +4,12 @@
 
 #include "base/strings/utf_string_conversions.h"
 
+#include <stdint.h>
+
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversion_utils.h"
+#include "build/build_config.h"
 
 namespace base {
 
@@ -24,9 +27,9 @@ bool ConvertUnicode(const SRC_CHAR* src,
                     DEST_STRING* output) {
   // ICU requires 32-bit numbers.
   bool success = true;
-  int32 src_len32 = static_cast<int32>(src_len);
-  for (int32 i = 0; i < src_len32; i++) {
-    uint32 code_point;
+  int32_t src_len32 = static_cast<int32_t>(src_len);
+  for (int32_t i = 0; i < src_len32; i++) {
+    uint32_t code_point;
     if (ReadUnicodeCharacter(src, src_len32, &i, &code_point)) {
       WriteUnicodeCharacter(code_point, output);
     } else {