Switch to standard integer types in ash/.

ash/test/display_manager_test_api.h

Index: ash/test/display_manager_test_api.h
diff --git a/ash/test/display_manager_test_api.h b/ash/test/display_manager_test_api.h
index 4bb070d438d581e5720c0ed9c53b17f1af399b53..d3c19ff59807744bad87f9c654d1609adf72284a 100644
--- a/ash/test/display_manager_test_api.h
+++ b/ash/test/display_manager_test_api.h
@@ -5,10 +5,12 @@
 #ifndef ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
 #define ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/display/types/display_constants.h"
 
 namespace gfx {
@@ -45,21 +47,21 @@ class DisplayManagerTestApi {
 
   // Set the 1st display as an internal display and returns the display Id for
   // the internal display.
-  int64 SetFirstDisplayAsInternalDisplay();
+  int64_t SetFirstDisplayAsInternalDisplay();
 
   // Don't update the display when the root window's size was changed.
   void DisableChangeDisplayUponHostResize();
 
   // Sets the available color profiles for |display_id|.
   void SetAvailableColorProfiles(
-      int64 display_id,
+      int64_t display_id,
       const std::vector<ui::ColorCalibrationProfile>& profiles);
 
  private:
   friend class ScopedSetInternalDisplayId;
   // Sets the display id for internal display and
   // update the display mode list if necessary.
-  void SetInternalDisplayId(int64 id);
+  void SetInternalDisplayId(int64_t id);
 
   DisplayManager* display_manager_;  // not owned
 
@@ -77,7 +79,7 @@ class ScopedDisable125DSFForUIScaling {
 
 class ScopedSetInternalDisplayId {
  public:
-  ScopedSetInternalDisplayId(int64 id);
+  ScopedSetInternalDisplayId(int64_t id);
   ~ScopedSetInternalDisplayId();
 
  private:
@@ -85,7 +87,7 @@ class ScopedSetInternalDisplayId {
 };
 
 // Sets the display mode that matches the |resolution| for |display_id|.
-bool SetDisplayResolution(int64 display_id, const gfx::Size& resolution);
+bool SetDisplayResolution(int64_t display_id, const gfx::Size& resolution);
 
 }  // namespace test
 }  // namespace ash