Switch to standard integer types in ui/gl/.

ui/gl/gpu_timing.h

 // Copyright (c) 2015 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.
 
 #ifndef UI_GL_GPU_TIMING_H_
 #define UI_GL_GPU_TIMING_H_
 
+#include <stdint.h>
+
 #include <memory>
 #include <queue>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gl/gl_export.h"
 
 // The gpu_timing classes handles the abstraction of GL GPU Timing extensions
 // into a common set of functions. Currently the different timer extensions that
 // are supported are EXT_timer_query, ARB_timer_query and
 // EXT_disjoint_timer_query.
 //
 // Explanation of Classes:
 //   GPUTiming - GPU Timing is a private class which is only owned by the
@@ skipping 67 matching lines @@
 
   // Start an instant timer, start and end will be equal.
   void QueryTimeStamp();
 
   // Start a timer range.
   void Start();
   void End();
 
   bool IsAvailable();
 
-  void GetStartEndTimestamps(int64* start, int64* end);
-  int64 GetDeltaElapsed();
+  void GetStartEndTimestamps(int64_t* start, int64_t* end);
+  int64_t GetDeltaElapsed();
 
  private:
   friend class GPUTimingClient;
 
   explicit GPUTimer(scoped_refptr<GPUTimingClient> gpu_timing_client,
                     bool use_elapsed_timer);
 
   bool use_elapsed_timer_ = false;
   enum TimerState {
     kTimerState_Ready,
@@ skipping 20 matching lines @@
 
   const char* GetTimerTypeName() const;
 
   // CheckAndResetTimerErrors has to be called before reading timestamps
   // from GPUTimers instances and after making sure all the timers
   // were available.
   // If the returned value is false, all the previous timers should be
   // discarded.
   bool CheckAndResetTimerErrors();
 
-  int64 GetCurrentCPUTime();
-  void SetCpuTimeForTesting(const base::Callback<int64(void)>& cpu_time);
+  int64_t GetCurrentCPUTime();
+  void SetCpuTimeForTesting(const base::Callback<int64_t(void)>& cpu_time);
 
   bool IsForceTimeElapsedQuery();
   void ForceTimeElapsedQuery();
 
  private:
   friend class base::RefCounted<GPUTimingClient>;
   friend class GPUTimer;
 
   virtual ~GPUTimingClient();
 
   GPUTimingImpl* gpu_timing_;
   GPUTiming::TimerType timer_type_ = GPUTiming::kTimerTypeInvalid;
   uint32_t disjoint_counter_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(GPUTimingClient);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GPU_TIMING_H_