| Index: gpu/command_buffer/service/vertex_array_manager.h
 | 
| diff --git a/gpu/command_buffer/service/vertex_array_manager.h b/gpu/command_buffer/service/vertex_array_manager.h
 | 
| index 97ecc1a5353a90fcd301c405dd82e2f916f56789..5649da1f1fdfe5ce2b2e0701743dff099e3e44c0 100644
 | 
| --- a/gpu/command_buffer/service/vertex_array_manager.h
 | 
| +++ b/gpu/command_buffer/service/vertex_array_manager.h
 | 
| @@ -5,9 +5,11 @@
 | 
|  #ifndef GPU_COMMAND_BUFFER_SERVICE_VERTEX_ARRAY_MANAGER_H_
 | 
|  #define GPU_COMMAND_BUFFER_SERVICE_VERTEX_ARRAY_MANAGER_H_
 | 
|  
 | 
| -#include "base/basictypes.h"
 | 
| +#include <stdint.h>
 | 
| +
 | 
|  #include "base/containers/hash_tables.h"
 | 
|  #include "base/logging.h"
 | 
| +#include "base/macros.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
|  #include "base/memory/scoped_ptr.h"
 | 
|  #include "gpu/command_buffer/service/gl_utils.h"
 | 
| @@ -33,7 +35,7 @@ class GPU_EXPORT VertexArrayManager {
 | 
|    scoped_refptr<VertexAttribManager> CreateVertexAttribManager(
 | 
|        GLuint client_id,
 | 
|        GLuint service_id,
 | 
| -      uint32 num_vertex_attribs,
 | 
| +      uint32_t num_vertex_attribs,
 | 
|        bool client_visible);
 | 
|  
 | 
|    // Gets the vertex attrib manager for the given vertex array.
 | 
| 
 |