Switch to standard integer types in ui/gfx/.

ui/gfx/text_utils.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/text_utils.h"
 
+#include <stdint.h>
+
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/utf16.h"
 
 namespace gfx {
 
 namespace {
 
@@ skipping 20 matching lines @@
                                      int* accelerated_char_pos,
                                      int* accelerated_char_span) {
   bool escaped = false;
   ptrdiff_t last_char_pos = -1;
   int last_char_span = 0;
   base::i18n::UTF16CharIterator chars(&s);
   base::string16 accelerator_removed;
 
   accelerator_removed.reserve(s.size());
   while (!chars.end()) {
-    int32 c = chars.get();
+    int32_t c = chars.get();
     int array_pos = chars.array_pos();
     chars.Advance();
 
     if (c != accelerator_char || escaped) {
       int span = chars.array_pos() - array_pos;
       if (escaped && c != accelerator_char) {
         last_char_pos = accelerator_removed.size();
         last_char_span = span;
       }
       for (int i = 0; i < span; i++)
@@ skipping 42 matching lines @@
          CharIsMark(GetCodePointAt(text, text_index))) {
     ++text_index;
   }
 
   // If |index| straddles a UTF-16 surrogate pair, go forward.
   U16_SET_CP_LIMIT(text.data(), 0, text_index, text_length);
   return static_cast<size_t>(text_index);
 }
 
 }  // namespace gfx