Switch to standard integer types in gpu/.

gpu/command_buffer/tests/gl_query_unittest.cc

 // Copyright 2014 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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
+#include <stdint.h>
 
 #include "base/threading/platform_thread.h"
 #include "gpu/command_buffer/tests/gl_manager.h"
 #include "gpu/command_buffer/tests/gl_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 
 class QueryTest : public testing::Test {
@@ skipping 47 matching lines @@
   // run this test.
   EXPECT_LE(result, base::TimeDelta(after - before).InMicroseconds());
 
   result = 0;
   available = 0;
   glGetQueryObjectuivEXT(error_query,
                          GL_QUERY_RESULT_AVAILABLE_EXT,
                          &available);
   EXPECT_TRUE(available);
   glGetQueryObjectuivEXT(error_query, GL_QUERY_RESULT_EXT, &result);
-  EXPECT_EQ(static_cast<uint32>(GL_INVALID_ENUM), result);
+  EXPECT_EQ(static_cast<uint32_t>(GL_INVALID_ENUM), result);
 }
 
 TEST_F(QueryTest, GetErrorBasic) {
   EXPECT_TRUE(GLTestHelper::HasExtension("GL_CHROMIUM_get_error_query"));
 
   GLuint query = 0;
   glGenQueriesEXT(1, &query);
 
   GLuint query_status = 0;
   GLuint result = 0;
 
   glBeginQueryEXT(GL_GET_ERROR_QUERY_CHROMIUM, query);
   glEnable(GL_TEXTURE_2D);  // Generates an INVALID_ENUM error
   glEndQueryEXT(GL_GET_ERROR_QUERY_CHROMIUM);
 
   glFinish();
 
   query_status = 0;
   result = 0;
   glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &result);
   EXPECT_TRUE(result);
   glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_EXT, &query_status);
-  EXPECT_EQ(static_cast<uint32>(GL_INVALID_ENUM), query_status);
+  EXPECT_EQ(static_cast<uint32_t>(GL_INVALID_ENUM), query_status);
 }
 
 TEST_F(QueryTest, DISABLED_LatencyQueryBasic) {
   EXPECT_TRUE(GLTestHelper::HasExtension(
                   "GL_CHROMIUM_command_buffer_latency_query"));
 
   GLuint query = 0;
   glGenQueriesEXT(1, &query);
 
   GLuint query_result = 0;
@@ skipping 78 matching lines @@
   glEndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
   glFinish();
   GLuint result = 0;
   glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &result);
   EXPECT_EQ(1u, result);
   glDeleteQueriesEXT(1, &query);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 }  // namespace gpu