Switch to standard integer types in gpu/.

gpu/config/gpu_test_expectations_parser.h

Index: gpu/config/gpu_test_expectations_parser.h
diff --git a/gpu/config/gpu_test_expectations_parser.h b/gpu/config/gpu_test_expectations_parser.h
index a69f7e96e32127d558ce33e55586180691c4c5d0..d943e44ca3c0a9e7b80f1bfa37d35174c48d7185 100644
--- a/gpu/config/gpu_test_expectations_parser.h
+++ b/gpu/config/gpu_test_expectations_parser.h
@@ -5,10 +5,12 @@
 #ifndef GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
 #define GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "gpu/config/gpu_test_config.h"
 #include "gpu/gpu_export.h"
@@ -38,8 +40,8 @@ class GPU_EXPORT GPUTestExpectationsParser {
   const std::vector<std::string>& GetErrorMessages() const;
 
   // Get the test expectation of a given test on a given bot.
-  int32 GetTestExpectation(const std::string& test_name,
-                           const GPUTestBotConfig& bot_config) const;
+  int32_t GetTestExpectation(const std::string& test_name,
+                             const GPUTestBotConfig& bot_config) const;
 
   // Parse a list of config modifiers. If we have a valid entry with no
   // conflicts, | config | stores it, and the function returns true.
@@ -51,7 +53,7 @@ class GPU_EXPORT GPUTestExpectationsParser {
 
     std::string test_name;
     GPUTestConfig test_config;
-    int32 test_expectation;
+    int32_t test_expectation;
     size_t line_number;
   };
 
@@ -60,8 +62,9 @@ class GPU_EXPORT GPUTestExpectationsParser {
   bool ParseLine(const std::string& line_data, size_t line_number);
 
   // Update OS/GPUVendor/BuildType modifiers. May generate an error message.
-  bool UpdateTestConfig(
-      GPUTestConfig* config, int32 token, size_t line_number);
+  bool UpdateTestConfig(GPUTestConfig* config,
+                        int32_t token,
+                        size_t line_number);
 
   // Update GPUDeviceID modifier. May generate an error message.
   bool UpdateTestConfig(GPUTestConfig* config,