Switch to standard integer types in gpu/.

gpu/command_buffer/service/command_buffer_service_unittest.cc

Index: gpu/command_buffer/service/command_buffer_service_unittest.cc
diff --git a/gpu/command_buffer/service/command_buffer_service_unittest.cc b/gpu/command_buffer/service/command_buffer_service_unittest.cc
index 1113fa5bdd3467fddb269a57ca052ac908233437..5b39a969afec332e3bc77e81a0bce5cff1817d8b 100644
--- a/gpu/command_buffer/service/command_buffer_service_unittest.cc
+++ b/gpu/command_buffer/service/command_buffer_service_unittest.cc
@@ -2,14 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/threading/thread.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 using base::SharedMemory;
 using testing::_;
@@ -33,24 +36,16 @@ class CommandBufferServiceTest : public testing::Test {
     EXPECT_TRUE(command_buffer_->Initialize());
   }
 
-  int32 GetGetOffset() {
-    return command_buffer_->GetLastState().get_offset;
-  }
+  int32_t GetGetOffset() { return command_buffer_->GetLastState().get_offset; }
 
-  int32 GetPutOffset() {
-    return command_buffer_->GetPutOffset();
-  }
+  int32_t GetPutOffset() { return command_buffer_->GetPutOffset(); }
 
-  int32 GetToken() {
-    return command_buffer_->GetLastState().token;
-  }
+  int32_t GetToken() { return command_buffer_->GetLastState().token; }
 
-  int32 GetError() {
-    return command_buffer_->GetLastState().error;
-  }
+  int32_t GetError() { return command_buffer_->GetLastState().error; }
 
   bool Initialize(size_t size) {
-    int32 id;
+    int32_t id;
     command_buffer_->CreateTransferBuffer(size, &id);
     EXPECT_GT(id, 0);
     command_buffer_->SetGetBuffer(id);
@@ -75,13 +70,13 @@ namespace {
 class CallbackTest {
  public:
   virtual void PutOffsetChanged() = 0;
-  virtual bool GetBufferChanged(int32 id) = 0;
+  virtual bool GetBufferChanged(int32_t id) = 0;
 };
 
 class MockCallbackTest : public CallbackTest {
  public:
    MOCK_METHOD0(PutOffsetChanged, void());
-   MOCK_METHOD1(GetBufferChanged, bool(int32));
+   MOCK_METHOD1(GetBufferChanged, bool(int32_t));
 };
 
 }  // anonymous namespace
@@ -118,7 +113,7 @@ TEST_F(CommandBufferServiceTest, CanSyncGetAndPutOffset) {
 }
 
 TEST_F(CommandBufferServiceTest, SetGetBuffer) {
-  int32 ring_buffer_id;
+  int32_t ring_buffer_id;
   command_buffer_->CreateTransferBuffer(1024, &ring_buffer_id);
   EXPECT_GT(ring_buffer_id, 0);