Switch to standard integer types in gpu/.

gpu/command_buffer/client/fenced_allocator_test.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.
 
 // This file contains the tests for the FencedAllocator class.
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/aligned_memory.h"
 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
 #include "gpu/command_buffer/client/fenced_allocator.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
@@ skipping 41 matching lines @@
         &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get())));
     command_buffer_->SetGetBufferChangeCallback(base::Bind(
         &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get())));
 
     api_mock_->set_engine(gpu_scheduler_.get());
 
     helper_.reset(new CommandBufferHelper(command_buffer_.get()));
     helper_->Initialize(kBufferSize);
   }
 
-  int32 GetToken() {
-    return command_buffer_->GetLastState().token;
-  }
+  int32_t GetToken() { return command_buffer_->GetLastState().token; }
 
   scoped_ptr<AsyncAPIMock> api_mock_;
   scoped_refptr<TransferBufferManagerInterface> transfer_buffer_manager_;
   scoped_ptr<CommandBufferService> command_buffer_;
   scoped_ptr<GpuScheduler> gpu_scheduler_;
   scoped_ptr<CommandBufferHelper> helper_;
   base::MessageLoop message_loop_;
 };
 
 #ifndef _MSC_VER
@@ skipping 106 matching lines @@
     EXPECT_GE(kBufferSize, offsets[i]+kSize);
     EXPECT_TRUE(allocator_->CheckConsistency());
   }
 
   // This allocation should fail.
   FencedAllocator::Offset offset_failed = allocator_->Alloc(kSize);
   EXPECT_EQ(FencedAllocator::kInvalidOffset, offset_failed);
   EXPECT_TRUE(allocator_->CheckConsistency());
 
   // Free one successful allocation, pending fence.
-  int32 token = helper_.get()->InsertToken();
+  int32_t token = helper_.get()->InsertToken();
   allocator_->FreePendingToken(offsets[0], token);
   EXPECT_TRUE(allocator_->CheckConsistency());
 
   // The way we hooked up the helper and engine, it won't process commands
   // until it has to wait for something. Which means the token shouldn't have
   // passed yet at this point.
   EXPECT_GT(token, GetToken());
 
   // This allocation will need to reclaim the space freed above, so that should
   // process the commands until the token is passed.
@@ skipping 26 matching lines @@
     EXPECT_NE(FencedAllocator::kInvalidOffset, offsets[i]);
     EXPECT_GE(kBufferSize, offsets[i]+kSize);
     EXPECT_TRUE(allocator_->CheckConsistency());
   }
   EXPECT_TRUE(allocator_->InUse());
 
   // No memory should be available.
   EXPECT_EQ(0u, allocator_->GetLargestFreeSize());
 
   // Free one successful allocation, pending fence.
-  int32 token = helper_.get()->InsertToken();
+  int32_t token = helper_.get()->InsertToken();
   allocator_->FreePendingToken(offsets[0], token);
   EXPECT_TRUE(allocator_->CheckConsistency());
 
   // Force the command buffer to process the token.
   helper_->Finish();
 
   // Tell the allocator to update what's available based on the current token.
   allocator_->FreeUnused();
 
   // Check that the new largest free size takes into account the unused block.
@@ skipping 95 matching lines @@
   FencedAllocator::Offset offset1 = allocator_->Alloc(kSize);
   ASSERT_NE(FencedAllocator::kInvalidOffset, offset1);
   FencedAllocator::Offset offset2 = allocator_->Alloc(kSize);
   ASSERT_NE(FencedAllocator::kInvalidOffset, offset2);
   allocator_->Free(offset);
   allocator_->Free(offset1);
   EXPECT_EQ(kBufferSize - 3 * kSize,
             allocator_->GetLargestFreeOrPendingSize());
 
   // Free the last one, pending a token.
-  int32 token = helper_.get()->InsertToken();
+  int32_t token = helper_.get()->InsertToken();
   allocator_->FreePendingToken(offset2, token);
 
   // Now all the buffers have been freed...
   EXPECT_EQ(kBufferSize, allocator_->GetLargestFreeOrPendingSize());
   // .. but one is still waiting for the token.
   EXPECT_EQ(kBufferSize - 3 * kSize,
             allocator_->GetLargestFreeSize());
 
   // The way we hooked up the helper and engine, it won't process commands
   // until it has to wait for something. Which means the token shouldn't have
@@ skipping 167 matching lines @@
     EXPECT_TRUE(pointers[i]);
     EXPECT_TRUE(allocator_->CheckConsistency());
   }
 
   // This allocation should fail.
   void *pointer_failed = allocator_->Alloc(kSize);
   EXPECT_FALSE(pointer_failed);
   EXPECT_TRUE(allocator_->CheckConsistency());
 
   // Free one successful allocation, pending fence.
-  int32 token = helper_.get()->InsertToken();
+  int32_t token = helper_.get()->InsertToken();
   allocator_->FreePendingToken(pointers[0], token);
   EXPECT_TRUE(allocator_->CheckConsistency());
 
   // The way we hooked up the helper and engine, it won't process commands
   // until it has to wait for something. Which means the token shouldn't have
   // passed yet at this point.
   EXPECT_GT(token, GetToken());
 
   // This allocation will need to reclaim the space freed above, so that should
   // process the commands until the token is passed.
   pointers[0] = allocator_->Alloc(kSize);
   EXPECT_TRUE(pointers[0]);
   EXPECT_TRUE(allocator_->CheckConsistency());
   // Check that the token has indeed passed.
   EXPECT_LE(token, GetToken());
 
   // Free up everything.
   for (unsigned int i = 0; i < kAllocCount; ++i) {
     allocator_->Free(pointers[i]);
     EXPECT_TRUE(allocator_->CheckConsistency());
   }
 }
 
 }  // namespace gpu