Switch to standard integer types in ui/gfx/.

ui/gfx/canvas_unittest.cc

 // Copyright (c) 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/canvas.h"
 
 #include <limits>
 
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/skia_util.h"
 
 namespace gfx {
 
 class CanvasTest : public testing::Test {
  protected:
@@ skipping 58 matching lines @@
 #endif
 
 TEST_F(CanvasTest, MAYBE_StringSizeWithLineHeight) {
   gfx::Size one_line_size = SizeStringInt("Q", 0, 0);
   gfx::Size four_line_size = SizeStringInt("Q\nQ\nQ\nQ", 1000000, 1000);
   EXPECT_EQ(one_line_size.width(), four_line_size.width());
   EXPECT_EQ(3 * 1000 + one_line_size.height(), four_line_size.height());
 }
 
 }  // namespace gfx