Switch to standard integer types in ash/.

ash/wm/ash_native_cursor_manager_unittest.cc

 // 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 "ash/wm/ash_native_cursor_manager.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/shell.h"
@@ skipping 141 matching lines @@
 TEST_F(AshNativeCursorManagerTest, FractionalScale) {
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
   // Cursor should use the resource scale factor.
   UpdateDisplay("800x100*1.25");
   EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
 }
 #endif
 
 TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
-  int64 display_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t display_id = Shell::GetScreen()->GetPrimaryDisplay().id();
   gfx::Display::SetInternalDisplayId(display_id);
 
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
 
   SetDisplayUIScale(display_id, 0.5f);
   EXPECT_EQ(1.0f,
             Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
 
@@ skipping 28 matching lines @@
   loader.set_scale(2.0f);
   loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
   image = loader.GetXcursorImageForTest(kCursorId);
   EXPECT_EQ(height * 2, static_cast<int>(image->height));
   EXPECT_EQ(width * 2, static_cast<int>(image->width));
 }
 #endif
 
 }  // namespace test
 }  // namespace ash