Switch to standard integer types in gpu/.

gpu/command_buffer/service/gpu_tracer.h

Index: gpu/command_buffer/service/gpu_tracer.h
diff --git a/gpu/command_buffer/service/gpu_tracer.h b/gpu/command_buffer/service/gpu_tracer.h
index cb3f8902cac9720122b79dc9532870c02ec9056d..c54008cf3fb1aeae9acbcc3fbf2d0366d1753ee2 100644
--- a/gpu/command_buffer/service/gpu_tracer.h
+++ b/gpu/command_buffer/service/gpu_tracer.h
@@ -6,12 +6,14 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_
 
+#include <stdint.h>
+
 #include <deque>
 #include <stack>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
@@ -97,7 +99,7 @@ class GPU_EXPORT GPUTracer
   const unsigned char* gpu_trace_srv_category;
   const unsigned char* gpu_trace_dev_category;
   gles2::GLES2Decoder* decoder_;
-  int64 disjoint_time_ = 0;
+  int64_t disjoint_time_ = 0;
 
   bool gpu_executing_ = false;
   bool began_device_traces_ = false;
@@ -111,8 +113,8 @@ class Outputter : public base::RefCounted<Outputter> {
   virtual void TraceDevice(GpuTracerSource source,
                            const std::string& category,
                            const std::string& name,
-                           int64 start_time,
-                           int64 end_time) = 0;
+                           int64_t start_time,
+                           int64_t end_time) = 0;
 
   virtual void TraceServiceBegin(GpuTracerSource source,
                                  const std::string& category,
@@ -133,8 +135,8 @@ class TraceOutputter : public Outputter {
   void TraceDevice(GpuTracerSource source,
                    const std::string& category,
                    const std::string& name,
-                   int64 start_time,
-                   int64 end_time) override;
+                   int64_t start_time,
+                   int64_t end_time) override;
 
   void TraceServiceBegin(GpuTracerSource source,
                          const std::string& category,
@@ -150,10 +152,10 @@ class TraceOutputter : public Outputter {
   ~TraceOutputter() override;
 
   base::Thread named_thread_;
-  uint64 local_trace_device_id_ = 0;
-  uint64 local_trace_service_id_ = 0;
+  uint64_t local_trace_device_id_ = 0;
+  uint64_t local_trace_service_id_ = 0;
 
-  std::stack<uint64> trace_service_id_stack_[NUM_TRACER_SOURCES];
+  std::stack<uint64_t> trace_service_id_stack_[NUM_TRACER_SOURCES];
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TraceOutputter);