Switch to standard integer types in ash/.

ash/display/cursor_window_controller_unittest.cc

 // Copyright 2015 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/display/cursor_window_controller.h"
 
 #include "ash/display/display_util.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
@@ skipping 26 matching lines @@
   }
 
   aura::Window* GetCursorWindow() const {
     return cursor_window_controller_->cursor_window_.get();
   }
 
   const gfx::ImageSkia& GetCursorImage() const {
     return cursor_window_controller_->GetCursorImageForTest();
   }
 
-  int64 GetCursorDisplayId() const {
+  int64_t GetCursorDisplayId() const {
     return cursor_window_controller_->display_.id();
   }
 
   void SetCursorCompositionEnabled(bool enabled) {
     cursor_window_controller_ = Shell::GetInstance()
                                     ->window_tree_host_manager()
                                     ->cursor_window_controller();
     cursor_window_controller_->SetCursorCompositingEnabled(enabled);
   }
 
  private:
   // Not owned.
   CursorWindowController* cursor_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorWindowControllerTest);
 };
 
 // Test that the composited cursor moves to another display when the real cursor
 // moves to another display.
 TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("200x200,200x200*2/r");
 
   WindowTreeHostManager* window_tree_host_manager =
       Shell::GetInstance()->window_tree_host_manager();
-  int64 primary_display_id = window_tree_host_manager->GetPrimaryDisplayId();
-  int64 secondary_display_id = ScreenUtil::GetSecondaryDisplay().id();
+  int64_t primary_display_id = window_tree_host_manager->GetPrimaryDisplayId();
+  int64_t secondary_display_id = ScreenUtil::GetSecondaryDisplay().id();
   aura::Window* primary_root =
       window_tree_host_manager->GetRootWindowForDisplayId(primary_display_id);
   aura::Window* secondary_root =
       window_tree_host_manager->GetRootWindowForDisplayId(secondary_display_id);
 
   ui::test::EventGenerator primary_generator(primary_root);
   primary_generator.MoveMouseToInHost(20, 50);
 
   EXPECT_TRUE(primary_root->Contains(GetCursorWindow()));
   EXPECT_EQ(primary_display_id, GetCursorDisplayId());
@@ skipping 60 matching lines @@
   // Cursor was shown.
   SetCursorCompositionEnabled(true);
   ASSERT_TRUE(GetCursorWindow());
   EXPECT_TRUE(GetCursorWindow()->IsVisible());
 }
 
 // Make sure that composition cursor stays big even when
 // the DSF becomes 1x as a result of zooming out.
 TEST_F(CursorWindowControllerTest, DSF) {
   UpdateDisplay("1000x500*2");
-  int64 primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
 
   test::ScopedSetInternalDisplayId set_internal(primary_id);
   SetCursorCompositionEnabled(true);
   ASSERT_EQ(2.0f,
             Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_TRUE(GetCursorImage().HasRepresentation(2.0f));
 
   ASSERT_TRUE(SetDisplayUIScale(primary_id, 2.0f));
   ASSERT_EQ(1.0f,
             Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_TRUE(GetCursorImage().HasRepresentation(2.0f));
 }
 #endif
 
 }  // namespace ash