Switch to standard integer types in base/test/.

base/test/trace_event_analyzer.h

 // 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.
 
 // Use trace_analyzer::Query and trace_analyzer::TraceAnalyzer to search for
 // specific trace events that were generated by the trace_event.h API.
 //
 // Basic procedure:
 // - Get trace events JSON string from base::trace_event::TraceLog.
 // - Create TraceAnalyzer with JSON string.
@@ skipping 58 matching lines @@
 //   for (size_t i = 0; i < events.size(); ++i) {
 //     double duration;
 //     EXPECT_TRUE(events[i].GetAbsTimeToOtherEvent(&duration));
 //     EXPECT_LT(duration, 1000000.0/60.0); // expect less than 1/60 second.
 //   }
 
 
 #ifndef BASE_TEST_TRACE_EVENT_ANALYZER_H_
 #define BASE_TEST_TRACE_EVENT_ANALYZER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/trace_event/trace_event.h"
 
 namespace base {
 class Value;
 }
 
 namespace trace_analyzer {
 class QueryNode;
 
@@ skipping 85 matching lines @@
   ~Query();
 
   ////////////////////////////////////////////////////////////////
   // Query literal values
 
   // Compare with the given string.
   static Query String(const std::string& str);
 
   // Compare with the given number.
   static Query Double(double num);
-  static Query Int(int32 num);
-  static Query Uint(uint32 num);
+  static Query Int(int32_t num);
+  static Query Uint(uint32_t num);
 
   // Compare with the given bool.
   static Query Bool(bool boolean);
 
   // Compare with the given phase.
   static Query Phase(char phase);
 
   // Compare with the given string pattern. Only works with == and != operators.
   // Example: Query(EVENT_NAME) == Query::Pattern("MyEvent*")
   static Query Pattern(const std::string& pattern);
@@ skipping 201 matching lines @@
   Query operator||(const Query& rhs) const;
   Query operator!() const;
 
   // Arithmetic operators:
   // Following operators are applied to double arguments:
   Query operator+(const Query& rhs) const;
   Query operator-(const Query& rhs) const;
   Query operator*(const Query& rhs) const;
   Query operator/(const Query& rhs) const;
   Query operator-() const;
-  // Mod operates on int64 args (doubles are casted to int64 beforehand):
+  // Mod operates on int64_t args (doubles are casted to int64_t beforehand):
   Query operator%(const Query& rhs) const;
 
   // Return true if the given event matches this query tree.
   // This is a recursive method that walks the query tree.
   bool Evaluate(const TraceEvent& event) const;
 
  private:
   enum TraceEventMember {
     EVENT_INVALID,
     EVENT_PID,
@@ skipping 277 matching lines @@
 
 // Count all matches.
 static inline size_t CountMatches(const TraceEventVector& events,
                                   const Query& query) {
   return CountMatches(events, query, 0u, events.size());
 }
 
 }  // namespace trace_analyzer
 
 #endif  // BASE_TEST_TRACE_EVENT_ANALYZER_H_