Switch to standard integer types in gpu/.

gpu/gles2_conform_support/gles2_conform_test.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/gles2_conform_support/gles2_conform_test.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 23 matching lines @@
     return false;
   }
   gpu::GPUTestBotConfig bot_config;
   if (!bot_config.LoadCurrentConfig(NULL)) {
     LOG(ERROR) << "Fail to load bot configuration";
     return false;
   }
 
   // Set the bot config api based on the OS and command line
   base::CommandLine* current_cmd_line = base::CommandLine::ForCurrentProcess();
-  int32 config_os = bot_config.os();
+  int32_t config_os = bot_config.os();
   if ((config_os & gpu::GPUTestConfig::kOsWin) != 0) {
     std::string angle_renderer =
         current_cmd_line->HasSwitch("use-angle")
             ? current_cmd_line->GetSwitchValueASCII("use-angle")
             : "d3d11";
     if (angle_renderer == "d3d11") {
       bot_config.set_api(gpu::GPUTestConfig::kAPID3D11);
     } else if (angle_renderer == "d3d9") {
       bot_config.set_api(gpu::GPUTestConfig::kAPID3D9);
     } else if (angle_renderer == "gl") {
@@ skipping 13 matching lines @@
     bot_config.set_api(gpu::GPUTestConfig::kAPIUnknown);
   }
 
   if (!bot_config.IsValid()) {
     LOG(ERROR) << "Invalid bot configuration";
     return false;
   }
   std::string path_string(path);
   std::string test_name;
   base::ReplaceChars(path_string, "\\/.", "_", &test_name);
-  int32 expectation =
-    test_expectations.GetTestExpectation(test_name, bot_config);
+  int32_t expectation =
+      test_expectations.GetTestExpectation(test_name, bot_config);
   if (expectation != gpu::GPUTestExpectationsParser::kGpuTestPass) {
     LOG(WARNING) << "Test " << test_name << " is bypassed";
     return true;
   }
 
   base::FilePath test_path;
   PathService::Get(base::DIR_EXE, &test_path);
   base::FilePath program(test_path.Append(FILE_PATH_LITERAL(
       "gles2_conform_test_windowless")));
 
@@ skipping 21 matching lines @@
   base::CommandLine::Init(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }