Switch to standard integer types in skia/.

skia/ext/image_operations_bench.cc

Index: skia/ext/image_operations_bench.cc
diff --git a/skia/ext/image_operations_bench.cc b/skia/ext/image_operations_bench.cc
index 91820be15b83cdcd1011d3a481979cbf1b61db49..2c1c16772f78f86224fa23f40b5558480ea111a3 100644
--- a/skia/ext/image_operations_bench.cc
+++ b/skia/ext/image_operations_bench.cc
@@ -14,16 +14,19 @@
 // This number is somewhat reasonable way to measure this, given our current
 // implementation which somewhat scales this way.
 
+#include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkRect.h"
@@ -240,15 +243,15 @@ bool Benchmark::Run() const {
                                          dest_.width(), dest_.height());
   }
 
-  const int64 elapsed_us = (base::TimeTicks::Now() - start).InMicroseconds();
+  const int64_t elapsed_us = (base::TimeTicks::Now() - start).InMicroseconds();
 
-  const uint64 num_bytes = static_cast<uint64>(num_iterations_) *
-      (GetBitmapSize(&source) + GetBitmapSize(&dest));
+  const uint64_t num_bytes = static_cast<uint64_t>(num_iterations_) *
+                             (GetBitmapSize(&source) + GetBitmapSize(&dest));
 
   printf("%" PRIu64 " MB/s,\telapsed = %" PRIu64 " source=%d dest=%d\n",
-         static_cast<uint64>(elapsed_us == 0 ? 0 : num_bytes / elapsed_us),
-         static_cast<uint64>(elapsed_us),
-         GetBitmapSize(&source), GetBitmapSize(&dest));
+         static_cast<uint64_t>(elapsed_us == 0 ? 0 : num_bytes / elapsed_us),
+         static_cast<uint64_t>(elapsed_us), GetBitmapSize(&source),
+         GetBitmapSize(&dest));
 
   return true;
 }