Switch to standard integer types in gpu/.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
+#include <stdint.h>
+
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/context_state.h"
 #include "gpu/command_buffer/service/gl_surface_mock.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h"
 
@@ skipping 62 matching lines @@
 using namespace cmds;
 
 class GLES2DecoderRestoreStateTest : public GLES2DecoderManualInitTest {
  public:
   GLES2DecoderRestoreStateTest() {}
 
  protected:
   void AddExpectationsForActiveTexture(GLenum unit);
   void AddExpectationsForBindTexture(GLenum target, GLuint id);
   void InitializeContextState(ContextState* state,
-                              uint32 non_default_unit,
-                              uint32 active_unit);
+                              uint32_t non_default_unit,
+                              uint32_t active_unit);
 };
 
 INSTANTIATE_TEST_CASE_P(Service,
                         GLES2DecoderRestoreStateTest,
                         ::testing::Bool());
 
 void GLES2DecoderRestoreStateTest::AddExpectationsForActiveTexture(
     GLenum unit) {
   EXPECT_CALL(*gl_, ActiveTexture(unit)).Times(1).RetiresOnSaturation();
 }
 
 void GLES2DecoderRestoreStateTest::AddExpectationsForBindTexture(GLenum target,
                                                                  GLuint id) {
   EXPECT_CALL(*gl_, BindTexture(target, id)).Times(1).RetiresOnSaturation();
 }
 
 void GLES2DecoderRestoreStateTest::InitializeContextState(
     ContextState* state,
-    uint32 non_default_unit,
-    uint32 active_unit) {
+    uint32_t non_default_unit,
+    uint32_t active_unit) {
   state->texture_units.resize(group().max_texture_units());
-  for (uint32 tt = 0; tt < state->texture_units.size(); ++tt) {
+  for (uint32_t tt = 0; tt < state->texture_units.size(); ++tt) {
     TextureRef* ref_cube_map =
         group().texture_manager()->GetDefaultTextureInfo(GL_TEXTURE_CUBE_MAP);
     state->texture_units[tt].bound_texture_cube_map = ref_cube_map;
     TextureRef* ref_2d =
         (tt == non_default_unit)
             ? group().texture_manager()->GetTexture(client_texture_id_)
             : group().texture_manager()->GetDefaultTextureInfo(GL_TEXTURE_2D);
     state->texture_units[tt].bound_texture_2d = ref_2d;
   }
   state->active_texture_unit = active_unit;
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, NullPreviousStateBGR) {
   InitState init;
   init.bind_generates_resource = true;
   InitDecoder(init);
   SetupTexture();
 
   InSequence sequence;
   // Expect to restore texture bindings for unit GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
   AddExpectationsForBindTexture(GL_TEXTURE_2D, kServiceTextureId);
   AddExpectationsForBindTexture(GL_TEXTURE_CUBE_MAP,
                                 TestHelper::kServiceDefaultTextureCubemapId);
 
   // Expect to restore texture bindings for remaining units.
-  for (uint32 i = 1; i < group().max_texture_units(); ++i) {
+  for (uint32_t i = 1; i < group().max_texture_units(); ++i) {
     AddExpectationsForActiveTexture(GL_TEXTURE0 + i);
     AddExpectationsForBindTexture(GL_TEXTURE_2D,
                                   TestHelper::kServiceDefaultTexture2dId);
     AddExpectationsForBindTexture(GL_TEXTURE_CUBE_MAP,
                                   TestHelper::kServiceDefaultTextureCubemapId);
   }
 
   // Expect to restore the active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
   GetDecoder()->RestoreAllTextureUnitBindings(NULL);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, NullPreviousState) {
   InitState init;
   InitDecoder(init);
   SetupTexture();
 
   InSequence sequence;
   // Expect to restore texture bindings for unit GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
   AddExpectationsForBindTexture(GL_TEXTURE_2D, kServiceTextureId);
   AddExpectationsForBindTexture(GL_TEXTURE_CUBE_MAP, 0);
 
   // Expect to restore texture bindings for remaining units.
-  for (uint32 i = 1; i < group().max_texture_units(); ++i) {
+  for (uint32_t i = 1; i < group().max_texture_units(); ++i) {
     AddExpectationsForActiveTexture(GL_TEXTURE0 + i);
     AddExpectationsForBindTexture(GL_TEXTURE_2D, 0);
     AddExpectationsForBindTexture(GL_TEXTURE_CUBE_MAP, 0);
   }
 
   // Expect to restore the active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
   GetDecoder()->RestoreAllTextureUnitBindings(NULL);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, WithPreviousStateBGR) {
   InitState init;
   init.bind_generates_resource = true;
   InitDecoder(init);
   SetupTexture();
 
   // Construct a previous ContextState with all texture bindings
   // set to default textures.
   ContextState prev_state(NULL, NULL, NULL);
-  InitializeContextState(&prev_state, std::numeric_limits<uint32>::max(), 0);
+  InitializeContextState(&prev_state, std::numeric_limits<uint32_t>::max(), 0);
 
   InSequence sequence;
   // Expect to restore only GL_TEXTURE_2D binding for GL_TEXTURE0 unit,
   // since the rest of the bindings haven't changed between the current
   // state and the |prev_state|.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
   AddExpectationsForBindTexture(GL_TEXTURE_2D, kServiceTextureId);
 
   // Expect to restore active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
   GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, WithPreviousState) {
   InitState init;
   InitDecoder(init);
   SetupTexture();
 
   // Construct a previous ContextState with all texture bindings
   // set to default textures.
   ContextState prev_state(NULL, NULL, NULL);
-  InitializeContextState(&prev_state, std::numeric_limits<uint32>::max(), 0);
+  InitializeContextState(&prev_state, std::numeric_limits<uint32_t>::max(), 0);
 
   InSequence sequence;
   // Expect to restore only GL_TEXTURE_2D binding for GL_TEXTURE0 unit,
   // since the rest of the bindings haven't changed between the current
   // state and the |prev_state|.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
   AddExpectationsForBindTexture(GL_TEXTURE_2D, kServiceTextureId);
 
   // Expect to restore active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
   GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, ActiveUnit1) {
   InitState init;
   InitDecoder(init);
 
   // Bind a non-default texture to GL_TEXTURE1 unit.
   EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE1));
   ActiveTexture cmd;
   cmd.Init(GL_TEXTURE1);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   SetupTexture();
 
   // Construct a previous ContextState with all texture bindings
   // set to default textures.
   ContextState prev_state(NULL, NULL, NULL);
-  InitializeContextState(&prev_state, std::numeric_limits<uint32>::max(), 0);
+  InitializeContextState(&prev_state, std::numeric_limits<uint32_t>::max(), 0);
 
   InSequence sequence;
   // Expect to restore only GL_TEXTURE_2D binding for GL_TEXTURE1 unit,
   // since the rest of the bindings haven't changed between the current
   // state and the |prev_state|.
   AddExpectationsForActiveTexture(GL_TEXTURE1);
   AddExpectationsForBindTexture(GL_TEXTURE_2D, kServiceTextureId);
 
   // Expect to restore active texture unit to GL_TEXTURE1.
   AddExpectationsForActiveTexture(GL_TEXTURE1);
@@ skipping 219 matching lines @@
 // TODO(vmiura): Tests for ContextState::RestoreProgramBindings().
 
 // TODO(vmiura): Tests for ContextState::RestoreRenderbufferBindings().
 
 // TODO(vmiura): Tests for ContextState::RestoreProgramBindings().
 
 // TODO(vmiura): Tests for ContextState::RestoreGlobalState().
 
 }  // namespace gles2
 }  // namespace gpu