Switch to standard integer types in gpu/.

gpu/gles2_conform_support/egl/display.cc

Index: gpu/gles2_conform_support/egl/display.cc
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
index f79a4531dc3fd5966a2074917b1e0a3271fdd06e..b82807916e895683893fb44c6cb7343d4f801af7 100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -4,6 +4,9 @@
 
 #include "gpu/gles2_conform_support/egl/display.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ -21,8 +24,8 @@
 #include "gpu/gles2_conform_support/egl/surface.h"
 
 namespace {
-const int32 kCommandBufferSize = 1024 * 1024;
-const int32 kTransferBufferSize = 512 * 1024;
+const int32_t kCommandBufferSize = 1024 * 1024;
+const int32_t kTransferBufferSize = 512 * 1024;
 }
 
 namespace egl {
@@ -161,7 +164,7 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
   GetConfigAttrib(config, EGL_DEPTH_SIZE, &depth_size);
   GetConfigAttrib(config, EGL_ALPHA_SIZE, &alpha_size);
   GetConfigAttrib(config, EGL_STENCIL_SIZE, &stencil_size);
-  std::vector<int32> attribs;
+  std::vector<int32_t> attribs;
   attribs.push_back(EGL_DEPTH_SIZE);
   attribs.push_back(depth_size);
   attribs.push_back(EGL_ALPHA_SIZE);
@@ -293,7 +296,7 @@ int32_t Display::CreateImage(ClientBuffer buffer,
   return -1;
 }
 
-void Display::DestroyImage(int32 id) {
+void Display::DestroyImage(int32_t id) {
   NOTIMPLEMENTED();
 }
 
@@ -305,26 +308,26 @@ int32_t Display::CreateGpuMemoryBufferImage(size_t width,
   return -1;
 }
 
-uint32 Display::InsertSyncPoint() {
+uint32_t Display::InsertSyncPoint() {
   NOTIMPLEMENTED();
   return 0u;
 }
 
-uint32 Display::InsertFutureSyncPoint() {
+uint32_t Display::InsertFutureSyncPoint() {
   NOTIMPLEMENTED();
   return 0u;
 }
 
-void Display::RetireSyncPoint(uint32 sync_point) {
+void Display::RetireSyncPoint(uint32_t sync_point) {
   NOTIMPLEMENTED();
 }
 
-void Display::SignalSyncPoint(uint32 sync_point,
+void Display::SignalSyncPoint(uint32_t sync_point,
                               const base::Closure& callback) {
   NOTIMPLEMENTED();
 }
 
-void Display::SignalQuery(uint32 query, const base::Closure& callback) {
+void Display::SignalQuery(uint32_t query, const base::Closure& callback) {
   NOTIMPLEMENTED();
 }