Switch to standard integer types in base/trace_event/.

base/trace_event/trace_event_synthetic_delay_unittest.cc

Index: base/trace_event/trace_event_synthetic_delay_unittest.cc
diff --git a/base/trace_event/trace_event_synthetic_delay_unittest.cc b/base/trace_event/trace_event_synthetic_delay_unittest.cc
index 1dc0fc26f5c7a1289a52e381e262e13c7f992fc9..97a4580b3bbad69810a38c2ca33d291b6e8060fe 100644
--- a/base/trace_event/trace_event_synthetic_delay_unittest.cc
+++ b/base/trace_event/trace_event_synthetic_delay_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "base/trace_event/trace_event_synthetic_delay.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -39,19 +42,19 @@ class TraceEventSyntheticDelayTest : public testing::Test,
 
   void AdvanceTime(base::TimeDelta delta) { now_ += delta; }
 
-  int64 TestFunction() {
+  int64_t TestFunction() {
     base::TimeTicks start = Now();
     { TRACE_EVENT_SYNTHETIC_DELAY("test.Delay"); }
     return (Now() - start).InMilliseconds();
   }
 
-  int64 AsyncTestFunctionBegin() {
+  int64_t AsyncTestFunctionBegin() {
     base::TimeTicks start = Now();
     { TRACE_EVENT_SYNTHETIC_DELAY_BEGIN("test.AsyncDelay"); }
     return (Now() - start).InMilliseconds();
   }
 
-  int64 AsyncTestFunctionEnd() {
+  int64_t AsyncTestFunctionEnd() {
     base::TimeTicks start = Now();
     { TRACE_EVENT_SYNTHETIC_DELAY_END("test.AsyncDelay"); }
     return (Now() - start).InMilliseconds();