Switch to standard integer types in ash/.

ash/display/display_info.h

Index: ash/display/display_info.h
diff --git a/ash/display/display_info.h b/ash/display/display_info.h
index 57cd18a26c6b1a9da3706837ba3d076dfdfe73ab..8eab3e202de805d8e669edfcf66ea9bf7553be04 100644
--- a/ash/display/display_info.h
+++ b/ash/display/display_info.h
@@ -5,6 +5,8 @@
 #ifndef ASH_DISPLAY_DISPLAY_INFO_H_
 #define ASH_DISPLAY_DISPLAY_INFO_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
@@ -83,8 +85,7 @@ class ASH_EXPORT DisplayInfo {
   static DisplayInfo CreateFromSpec(const std::string& spec);
 
   // Creates a DisplayInfo from string spec using given |id|.
-  static DisplayInfo CreateFromSpecWithID(const std::string& spec,
-                                          int64 id);
+  static DisplayInfo CreateFromSpecWithID(const std::string& spec, int64_t id);
 
   // When this is set to true on the device whose internal display has
   // 1.25 dsf, Chrome uses 1.0f as a default scale factor, and uses
@@ -92,10 +93,10 @@ class ASH_EXPORT DisplayInfo {
   static void SetUse125DSFForUIScalingForTest(bool enable);
 
   DisplayInfo();
-  DisplayInfo(int64 id, const std::string& name, bool has_overscan);
+  DisplayInfo(int64_t id, const std::string& name, bool has_overscan);
   ~DisplayInfo();
 
-  int64 id() const { return id_; }
+  int64_t id() const { return id_; }
 
   // The name of the display.
   const std::string& name() const { return name_; }
@@ -247,7 +248,7 @@ class ASH_EXPORT DisplayInfo {
   // SetUse125DSFForUIScaling(true) is called and this is the internal display.
   bool Use125DSFForUIScaling() const;
 
-  int64 id_;
+  int64_t id_;
   std::string name_;
   bool has_overscan_;
   std::map<gfx::Display::RotationSource, gfx::Display::Rotation> rotations_;