Switch to standard integer types in gpu/.

gpu/command_buffer/service/vertex_attrib_manager_unittest.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 "gpu/command_buffer/service/vertex_attrib_manager.h"
 
+#include <stdint.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 
 using ::testing::Pointee;
 using ::testing::_;
 
 namespace gpu {
 namespace gles2 {
 
 class VertexAttribManagerTest : public GpuServiceTest {
  public:
-  static const uint32 kNumVertexAttribs = 8;
+  static const uint32_t kNumVertexAttribs = 8;
 
   VertexAttribManagerTest() {
   }
 
   ~VertexAttribManagerTest() override {}
 
  protected:
   void SetUp() override {
     GpuServiceTest::SetUp();
 
-    for (uint32 ii = 0; ii < kNumVertexAttribs; ++ii) {
+    for (uint32_t ii = 0; ii < kNumVertexAttribs; ++ii) {
       EXPECT_CALL(*gl_, VertexAttrib4f(ii, 0.0f, 0.0f, 0.0f, 1.0f))
           .Times(1)
           .RetiresOnSaturation();
     }
 
     manager_ = new VertexAttribManager();
     manager_->Initialize(kNumVertexAttribs, true);
   }
 
   scoped_refptr<VertexAttribManager> manager_;
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
-const uint32 VertexAttribManagerTest::kNumVertexAttribs;
+const uint32_t VertexAttribManagerTest::kNumVertexAttribs;
 #endif
 
 TEST_F(VertexAttribManagerTest, Basic) {
   EXPECT_TRUE(manager_->GetVertexAttrib(kNumVertexAttribs) == NULL);
   EXPECT_FALSE(manager_->HaveFixedAttribs());
 
   const VertexAttribManager::VertexAttribList& enabled_attribs =
       manager_->GetEnabledVertexAttribs();
   EXPECT_EQ(0u, enabled_attribs.size());
 
-  for (uint32 ii = 0; ii < kNumVertexAttribs; ii += kNumVertexAttribs - 1) {
+  for (uint32_t ii = 0; ii < kNumVertexAttribs; ii += kNumVertexAttribs - 1) {
     VertexAttrib* attrib = manager_->GetVertexAttrib(ii);
     ASSERT_TRUE(attrib != NULL);
     EXPECT_EQ(ii, attrib->index());
     EXPECT_TRUE(attrib->buffer() == NULL);
     EXPECT_EQ(0, attrib->offset());
     EXPECT_EQ(4, attrib->size());
     EXPECT_EQ(static_cast<GLenum>(GL_FLOAT), attrib->type());
     EXPECT_EQ(GL_FALSE, attrib->normalized());
     EXPECT_EQ(0, attrib->gl_stride());
     EXPECT_FALSE(attrib->enabled());
@@ skipping 147 matching lines @@
   buffer_manager.Destroy(false);
 }
 
 // TODO(gman): Test ValidateBindings
 // TODO(gman): Test ValidateBindings with client side arrays.
 
 }  // namespace gles2
 }  // namespace gpu