Switch to standard integer types in gpu/.

gpu/command_buffer/service/error_state.cc

 // Copyright (c) 2013 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/error_state.h"
 
+#include <stdint.h>
+
 #include <string>
 
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/logger.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace gpu {
 namespace gles2 {
 
 class ErrorStateImpl : public ErrorState {
  public:
   explicit ErrorStateImpl(ErrorStateClient* client, Logger* logger);
   ~ErrorStateImpl() override;
 
-  uint32 GetGLError() override;
+  uint32_t GetGLError() override;
 
   void SetGLError(const char* filename,
                   int line,
                   unsigned int error,
                   const char* function_name,
                   const char* msg) override;
   void SetGLErrorInvalidEnum(const char* filename,
                              int line,
                              const char* function_name,
                              unsigned int value,
@@ skipping 22 matching lines @@
   void ClearRealGLErrors(const char* filename,
                          int line,
                          const char* function_name) override;
 
  private:
   GLenum GetErrorHandleContextLoss();
 
   // The last error message set.
   std::string last_error_;
   // Current GL error bits.
-  uint32 error_bits_;
+  uint32_t error_bits_;
 
   ErrorStateClient* client_;
   Logger* logger_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorStateImpl);
 };
 
 ErrorState::ErrorState() {}
 
 ErrorState::~ErrorState() {}
 
 ErrorState* ErrorState::Create(ErrorStateClient* client, Logger* logger) {
   return new ErrorStateImpl(client, logger);
 }
 
 ErrorStateImpl::ErrorStateImpl(ErrorStateClient* client, Logger* logger)
     : error_bits_(0), client_(client), logger_(logger) {}
 
 ErrorStateImpl::~ErrorStateImpl() {}
 
-uint32 ErrorStateImpl::GetGLError() {
+uint32_t ErrorStateImpl::GetGLError() {
   // Check the GL error first, then our wrapped error.
   GLenum error = GetErrorHandleContextLoss();
   if (error == GL_NO_ERROR && error_bits_ != 0) {
-    for (uint32 mask = 1; mask != 0; mask = mask << 1) {
+    for (uint32_t mask = 1; mask != 0; mask = mask << 1) {
       if ((error_bits_ & mask) != 0) {
         error = GLES2Util::GLErrorBitToGLError(mask);
         break;
       }
     }
   }
 
   if (error != GL_NO_ERROR) {
     // There was an error, clear the corresponding wrapped error.
     error_bits_ &= ~GLES2Util::GLErrorToErrorBit(error);
@@ skipping 108 matching lines @@
           GLES2Util::GetStringEnum(error) + " : " +
           function_name + ": was unhandled");
       NOTREACHED() << "GL error " << error << " was unhandled.";
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu