Switch to standard integer types in base/trace_event/.

base/trace_event/trace_event_android.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 "base/trace_event/trace_event_impl.h"
 
 #include <fcntl.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/trace_event/trace_event.h"
 
 namespace base {
 namespace trace_event {
@@ skipping 23 matching lines @@
     const char* category_group,
     const char* name,
     unsigned long long id,
     const char** arg_names,
     const unsigned char* arg_types,
     const TraceEvent::TraceValue* arg_values,
     const scoped_refptr<ConvertableToTraceFormat>* convertable_values,
     unsigned int flags) {
   std::string out = StringPrintf("%c|%d|%s", phase, getpid(), name);
   if (flags & TRACE_EVENT_FLAG_HAS_ID)
-    StringAppendF(&out, "-%" PRIx64, static_cast<uint64>(id));
+    StringAppendF(&out, "-%" PRIx64, static_cast<uint64_t>(id));
   out += '|';
 
   for (int i = 0; i < kTraceMaxNumArgs && arg_names[i];
        ++i) {
     if (i)
       out += ';';
     out += arg_names[i];
     out += '=';
     std::string::size_type value_start = out.length();
     if (arg_types[i] == TRACE_VALUE_TYPE_CONVERTABLE)
@@ skipping 108 matching lines @@
                  flags_);
       WriteToATrace(g_atrace_fd, "E", 1);
       break;
 
     case TRACE_EVENT_PHASE_COUNTER:
       for (int i = 0; i < kTraceMaxNumArgs && arg_names_[i]; ++i) {
         DCHECK(arg_types_[i] == TRACE_VALUE_TYPE_INT);
         std::string out = base::StringPrintf(
             "C|%d|%s-%s", getpid(), name_, arg_names_[i]);
         if (flags_ & TRACE_EVENT_FLAG_HAS_ID)
-          StringAppendF(&out, "-%" PRIx64, static_cast<uint64>(id_));
+          StringAppendF(&out, "-%" PRIx64, static_cast<uint64_t>(id_));
         StringAppendF(&out, "|%d|%s",
                       static_cast<int>(arg_values_[i].as_int), category_group);
         WriteToATrace(g_atrace_fd, out.c_str(), out.size());
       }
       break;
 
     default:
       // Do nothing.
       break;
   }
@@ skipping 12 matching lines @@
   // trace buffer.
   double now_in_seconds = (TimeTicks::Now() - TimeTicks()).InSecondsF();
   std::string marker = StringPrintf(
       "trace_event_clock_sync: parent_ts=%f\n", now_in_seconds);
   WriteToATrace(atrace_fd, marker.c_str(), marker.size());
   close(atrace_fd);
 }
 
 }  // namespace trace_event
 }  // namespace base