Switch to standard integer types in gpu/.

gpu/config/gpu_info.h

 // 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.
 
 #ifndef GPU_CONFIG_GPU_INFO_H_
 #define GPU_CONFIG_GPU_INFO_H_
 
 // Provides access to the GPU information for the system
 // on which chrome is currently running.
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/time/time.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "gpu/config/dx_diag_node.h"
 #include "gpu/gpu_export.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace gpu {
 
 // Result for the various Collect*Info* functions below.
@@ skipping 43 matching lines @@
   VideoDecodeAcceleratorCapabilities();
   ~VideoDecodeAcceleratorCapabilities();
   VideoDecodeAcceleratorSupportedProfiles supported_profiles;
   uint32_t flags;
 };
 
 // Specification of an encoding profile supported by a hardware encoder.
 struct GPU_EXPORT VideoEncodeAcceleratorSupportedProfile {
   VideoCodecProfile profile;
   gfx::Size max_resolution;
-  uint32 max_framerate_numerator;
-  uint32 max_framerate_denominator;
+  uint32_t max_framerate_numerator;
+  uint32_t max_framerate_denominator;
 };
 using VideoEncodeAcceleratorSupportedProfiles =
     std::vector<VideoEncodeAcceleratorSupportedProfile>;
 
 struct GPU_EXPORT GPUInfo {
   struct GPU_EXPORT GPUDevice {
     GPUDevice();
     ~GPUDevice();
 
-    // The DWORD (uint32) representing the graphics card vendor id.
-    uint32 vendor_id;
+    // The DWORD (uint32_t) representing the graphics card vendor id.
+    uint32_t vendor_id;
 
-    // The DWORD (uint32) representing the graphics card device id.
+    // The DWORD (uint32_t) representing the graphics card device id.
     // Device ids are unique to vendor, not to one another.
-    uint32 device_id;
+    uint32_t device_id;
 
     // Whether this GPU is the currently used one.
     // Currently this field is only supported and meaningful on OS X.
     bool active;
 
     // The strings that describe the GPU.
     // In Linux these strings are obtained through libpci.
     // In Win/MacOSX, these two strings are not filled at the moment.
     // In Android, these are respectively GL_VENDOR and GL_RENDERER.
     std::string vendor_string;
@@ skipping 28 matching lines @@
   GPUDevice gpu;
 
   // Secondary GPUs, for example, the integrated GPU in a dual GPU machine.
   std::vector<GPUDevice> secondary_gpus;
 
   // On Windows, the unique identifier of the adapter the GPU process uses.
   // The default is zero, which makes the browser process create its D3D device
   // on the primary adapter. Note that the primary adapter can change at any
   // time so it is better to specify a particular LUID. Note that valid LUIDs
   // are always non-zero.
-  uint64 adapter_luid;
+  uint64_t adapter_luid;
 
   // The vendor of the graphics driver currently installed.
   std::string driver_vendor;
 
   // The version of the graphics driver currently installed.
   std::string driver_version;
 
   // The date of the graphics driver currently installed.
   std::string driver_date;
 
@@ skipping 35 matching lines @@
   std::string gl_ws_vendor;
 
   // GL window system binding version.  "" if not available.
   std::string gl_ws_version;
 
   // GL window system binding extensions.  "" if not available.
   std::string gl_ws_extensions;
 
   // GL reset notification strategy as defined by GL_ARB_robustness. 0 if GPU
   // reset detection or notification not available.
-  uint32 gl_reset_notification_strategy;
+  uint32_t gl_reset_notification_strategy;
 
   // The device semantics, i.e. whether the Vista and Windows 7 specific
   // semantics are available.
   bool can_lose_context;
 
   bool software_rendering;
 
   // Whether the driver uses direct rendering. True on most platforms, false on
   // X11 when using remote X.
   bool direct_rendering;
@@ skipping 29 matching lines @@
   // In conjunction with EnumerateFields, this allows the embedder to
   // enumerate the values in this structure without having to embed
   // references to its specific member variables. This simplifies the
   // addition of new fields to this type.
   class Enumerator {
    public:
     // The following methods apply to the "current" object. Initially this
     // is the root object, but calls to BeginGPUDevice/EndGPUDevice and
     // BeginAuxAttributes/EndAuxAttributes change the object to which these
     // calls should apply.
-    virtual void AddInt64(const char* name, int64 value) = 0;
+    virtual void AddInt64(const char* name, int64_t value) = 0;
     virtual void AddInt(const char* name, int value) = 0;
     virtual void AddString(const char* name, const std::string& value) = 0;
     virtual void AddBool(const char* name, bool value) = 0;
     virtual void AddTimeDeltaInSecondsF(const char* name,
                                         const base::TimeDelta& value) = 0;
 
     // Markers indicating that a GPUDevice is being described.
     virtual void BeginGPUDevice() = 0;
     virtual void EndGPUDevice() = 0;
 
@@ skipping 16 matching lines @@
     virtual ~Enumerator() {}
   };
 
   // Outputs the fields in this structure to the provided enumerator.
   void EnumerateFields(Enumerator* enumerator) const;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_INFO_H_