Switch to standard integer types in ui/gl/.

ui/gl/gpu_timing_unittest.cc

 // Copyright 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.
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_context_stub_with_extensions.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_mock.h"
 #include "ui/gl/gpu_preference.h"
 #include "ui/gl/gpu_timing.h"
 #include "ui/gl/gpu_timing_fake.h"
 #include "ui/gl/test/gl_surface_test_support.h"
@@ skipping 103 matching lines @@
   EXPECT_FALSE(gpu_timer->IsAvailable());
 
   gpu_timing_fake_queries_.SetCurrentCPUTime(begin_cpu_time);
   EXPECT_TRUE(gpu_timer->IsAvailable());
 
   gpu_timing_fake_queries_.SetCurrentCPUTime(begin_cpu_time + 1);
   EXPECT_TRUE(gpu_timer->IsAvailable());
 
   EXPECT_EQ(0, gpu_timer->GetDeltaElapsed());
 
-  int64 start, end;
+  int64_t start, end;
   gpu_timer->GetStartEndTimestamps(&start, &end);
   EXPECT_EQ(begin_cpu_time, start);
   EXPECT_EQ(begin_cpu_time, end);
 }
 
 TEST_F(GPUTimingTest, QueryTimeStampUsingElapsedTest) {
   // Test timestamp queries using GL_EXT_timer_query which does not support
   // timestamp queries. Internally we fall back to time elapsed queries.
   SetupGLContext("3.2", "GL_EXT_timer_query");
   scoped_refptr<GPUTimingClient> client = CreateGPUTimingClient();
   scoped_ptr<GPUTimer> gpu_timer = client->CreateGPUTimer(false);
   ASSERT_TRUE(client->IsForceTimeElapsedQuery());
 
   const int64_t begin_cpu_time = 123;
   const int64_t begin_gl_time = 10 * base::Time::kNanosecondsPerMicrosecond;
   const int64_t cpu_gl_offset = begin_gl_time - begin_cpu_time;
   gpu_timing_fake_queries_.SetCPUGLOffset(cpu_gl_offset);
   gpu_timing_fake_queries_.SetCurrentCPUTime(begin_cpu_time);
   gpu_timing_fake_queries_.ExpectGPUTimeStampQuery(*gl_, true);
 
   gpu_timer->QueryTimeStamp();
 
   gpu_timing_fake_queries_.SetCurrentCPUTime(begin_cpu_time - 1);
   EXPECT_FALSE(gpu_timer->IsAvailable());
 
   gpu_timing_fake_queries_.SetCurrentCPUTime(begin_cpu_time + 1);
   EXPECT_TRUE(gpu_timer->IsAvailable());
   EXPECT_EQ(0, gpu_timer->GetDeltaElapsed());
 
-  int64 start, end;
+  int64_t start, end;
   gpu_timer->GetStartEndTimestamps(&start, &end);
   EXPECT_EQ(begin_cpu_time, start);
   EXPECT_EQ(begin_cpu_time, end);
 }
 
 }  // namespace gpu