Remove command_buffer/common/types.h.

gpu/command_buffer/service/error_state.h

 // 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.
 
 // This file contains the ErrorState class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_ERROR_STATE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_ERROR_STATE_H_
 
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
-#include "gpu/command_buffer/common/types.h"
+#include "base/macros.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
 class Logger;
 
 // Use these macro to synthesize GL errors instead of calling the error_state
 // functions directly as they will propogate the __FILE__ and __LINE__.
 
@@ skipping 38 matching lines @@
   // GL_OUT_OF_MEMORY can cause side effects such as losing the context.
   virtual void OnOutOfMemoryError() = 0;
 };
 
 class GPU_EXPORT ErrorState {
  public:
   virtual ~ErrorState();
 
   static ErrorState* Create(ErrorStateClient* client, Logger* logger);
 
-  virtual uint32 GetGLError() = 0;
+  virtual uint32_t GetGLError() = 0;
 
   virtual void SetGLError(
       const char* filename,
       int line,
       unsigned int error,
       const char* function_name,
       const char* msg) = 0;
   virtual void SetGLErrorInvalidEnum(
       const char* filename,
       int line,
@@ skipping 36 matching lines @@
   ErrorState();
 
   DISALLOW_COPY_AND_ASSIGN(ErrorState);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_ERROR_STATE_H_