Switch to standard integer types in base/trace_event/.

base/trace_event/trace_event_synthetic_delay_unittest.cc

 // Copyright 2014 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 "base/trace_event/trace_event_synthetic_delay.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace trace_event {
 namespace {
 
 const int kTargetDurationMs = 100;
 // Allow some leeway in timings to make it possible to run these tests with a
 // wall clock time source too.
 const int kShortDurationMs = 10;
@@ skipping 15 matching lines @@
   TraceEventSyntheticDelay* ConfigureDelay(const char* name) {
     TraceEventSyntheticDelay* delay = TraceEventSyntheticDelay::Lookup(name);
     delay->SetClock(this);
     delay->SetTargetDuration(
         base::TimeDelta::FromMilliseconds(kTargetDurationMs));
     return delay;
   }
 
   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();
   }
 
  private:
   base::TimeTicks now_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceEventSyntheticDelayTest);
 };
@@ skipping 80 matching lines @@
   delay->EndParallel(end_times[0]);
   EXPECT_GE((Now() - start_time).InMilliseconds(), kTargetDurationMs);
 
   start_time = Now();
   delay->EndParallel(end_times[1]);
   EXPECT_LT((Now() - start_time).InMilliseconds(), kShortDurationMs);
 }
 
 }  // namespace trace_event
 }  // namespace base