Switch to standard integer types in gpu/.

gpu/config/gpu_info_collector_mac.mm

 // Copyright (c) 2012 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/config/gpu_info_collector.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 
 #import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
 #import <IOKit/IOKitLib.h>
+#include <stddef.h>
+#include <stdint.h>
 
 namespace gpu {
 
 namespace {
 
 const UInt32 kVendorIDIntel = 0x8086;
 const UInt32 kVendorIDNVidia = 0x10de;
 const UInt32 kVendorIDAMD = 0x1002;
 
 // Return 0 if we couldn't find the property.
@@ skipping 132 matching lines @@
 
   TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
 
   gpu_info->can_lose_context =
       (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2);
   CollectInfoResult result = CollectGraphicsInfoGL(gpu_info);
   gpu_info->context_info_state = result;
   return result;
 }
 
-CollectInfoResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
+CollectInfoResult CollectGpuID(uint32_t* vendor_id, uint32_t* device_id) {
   DCHECK(vendor_id && device_id);
 
   GPUInfo::GPUDevice gpu = GetActiveGPU();
   *vendor_id = gpu.vendor_id;
   *device_id = gpu.device_id;
 
   if (*vendor_id != 0 && *device_id != 0)
     return kCollectInfoSuccess;
   return kCollectInfoNonFatalFailure;
 }
 
 CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
-  int32 model_major = 0, model_minor = 0;
+  int32_t model_major = 0, model_minor = 0;
   base::mac::ParseModelIdentifier(base::mac::GetModelIdentifier(),
                                   &gpu_info->machine_model_name,
                                   &model_major, &model_minor);
   gpu_info->machine_model_version =
       base::IntToString(model_major) + "." + base::IntToString(model_minor);
 
   CollectInfoResult result = CollectPCIVideoCardInfo(gpu_info);
   gpu_info->basic_info_state = result;
   return result;
 }
@@ skipping 11 matching lines @@
   gpu_info->driver_version = gpu_info->gl_version.substr(pos + 1);
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu