Switch to standard integer types in ash/.

ash/display/window_tree_host_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/display/window_tree_host_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
@@ skipping 111 matching lines @@
   }
   void OnAttemptToReactivateWindow(aura::Window* request_active,
                                    aura::Window* actual_active) override {}
 
   int CountAndReset() {
     EXPECT_EQ(changing_count_, changed_count_);
     changed_count_ = 0;
     return Resetter<int>(&changing_count_).value();
   }
 
-  int64 GetBoundsChangedCountAndReset() {
+  int64_t GetBoundsChangedCountAndReset() {
     return Resetter<int>(&bounds_changed_count_).value();
   }
 
-  int64 GetRotationChangedCountAndReset() {
+  int64_t GetRotationChangedCountAndReset() {
     return Resetter<int>(&rotation_changed_count_).value();
   }
 
-  int64 GetWorkareaChangedCountAndReset() {
+  int64_t GetWorkareaChangedCountAndReset() {
     return Resetter<int>(&workarea_changed_count_).value();
   }
 
-  int64 GetPrimaryChangedCountAndReset() {
+  int64_t GetPrimaryChangedCountAndReset() {
     return Resetter<int>(&primary_changed_count_).value();
   }
 
-  int64 GetChangedDisplayIdAndReset() {
-    return Resetter<int64>(&changed_display_id_).value();
+  int64_t GetChangedDisplayIdAndReset() {
+    return Resetter<int64_t>(&changed_display_id_).value();
   }
 
   int GetFocusChangedCountAndReset() {
     return Resetter<int>(&focus_changed_count_).value();
   }
 
   int GetActivationChangedCountAndReset() {
     return Resetter<int>(&activation_changed_count_).value();
   }
 
  private:
   int changing_count_;
   int changed_count_;
 
   int bounds_changed_count_;
   int rotation_changed_count_;
   int workarea_changed_count_;
   int primary_changed_count_;
-  int64 changed_display_id_;
+  int64_t changed_display_id_;
 
   int focus_changed_count_;
   int activation_changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 gfx::Display GetPrimaryDisplay() {
   return Shell::GetScreen()->GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[0]);
@@ skipping 163 matching lines @@
   float touch_radius_x_;
   float touch_radius_y_;
   float scroll_x_offset_;
   float scroll_y_offset_;
   float scroll_x_offset_ordinal_;
   float scroll_y_offset_ordinal_;
 
   DISALLOW_COPY_AND_ASSIGN(TestEventHandler);
 };
 
-float GetStoredUIScale(int64 id) {
+float GetStoredUIScale(int64_t id) {
   return Shell::GetInstance()
       ->display_manager()
       ->GetDisplayInfo(id)
       .GetEffectiveUIScale();
 }
 
 class TestMouseWatcherListener : public views::MouseWatcherListener {
  public:
   TestMouseWatcherListener() {}
 
@@ skipping 31 matching lines @@
   w1->Focus();
 
   TestObserver observer;
   UpdateDisplay("500x500,400x400");
   EXPECT_EQ(1, observer.CountAndReset());  // resize and add
   EXPECT_EQ(1, observer.GetBoundsChangedCountAndReset());
   EXPECT_EQ(1, observer.GetWorkareaChangedCountAndReset());
   EXPECT_EQ(0, observer.GetFocusChangedCountAndReset());
   EXPECT_EQ(0, observer.GetActivationChangedCountAndReset());
   gfx::Insets insets(5, 5, 5, 5);
-  int64 secondary_display_id = ScreenUtil::GetSecondaryDisplay().id();
+  int64_t secondary_display_id = ScreenUtil::GetSecondaryDisplay().id();
   Shell::GetInstance()->display_manager()->UpdateWorkAreaOfDisplay(
       secondary_display_id, insets);
 
   // Default layout is RIGHT.
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("500,0 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("505,5 390x390", GetSecondaryDisplay().work_area().ToString());
   EXPECT_EQ(0, observer.GetFocusChangedCountAndReset());
   EXPECT_EQ(0, observer.GetActivationChangedCountAndReset());
 
@@ skipping 108 matching lines @@
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("-300,500 400x400", GetSecondaryDisplay().bounds().ToString());
 
   UpdateDisplay("500x500");
   EXPECT_LE(1, observer.GetFocusChangedCountAndReset());
   EXPECT_LE(1, observer.GetActivationChangedCountAndReset());
 }
 
 namespace {
 
-DisplayInfo CreateDisplayInfo(int64 id,
+DisplayInfo CreateDisplayInfo(int64_t id,
                               int y,
                               gfx::Display::Rotation rotation) {
   DisplayInfo info(id, "", false);
   info.SetBounds(gfx::Rect(0, y, 500, 500));
   info.SetRotation(rotation, gfx::Display::ROTATION_SOURCE_ACTIVE);
   return info;
 }
 
-DisplayInfo CreateMirroredDisplayInfo(int64 id, float device_scale_factor) {
+DisplayInfo CreateMirroredDisplayInfo(int64_t id, float device_scale_factor) {
   DisplayInfo info = CreateDisplayInfo(id, 0, gfx::Display::ROTATE_0);
   info.set_device_scale_factor(device_scale_factor);
   return info;
 }
 
 }  // namespace
 
 TEST_F(WindowTreeHostManagerTest, MirrorToDockedWithFullscreen) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Creates windows to catch activation change event.
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1));
   w1->Focus();
 
   // Docked mode.
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
   const DisplayInfo internal_display_info = CreateMirroredDisplayInfo(1, 2.0f);
   const DisplayInfo external_display_info = CreateMirroredDisplayInfo(2, 1.0f);
 
   std::vector<DisplayInfo> display_info_list;
   // Mirror.
   display_info_list.push_back(internal_display_info);
   display_info_list.push_back(external_display_info);
   display_manager->OnNativeDisplaysChanged(display_info_list);
-  const int64 internal_display_id =
+  const int64_t internal_display_id =
       test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
   EXPECT_EQ(1, internal_display_id);
   EXPECT_EQ(2U, display_manager->num_connected_displays());
   EXPECT_EQ(1U, display_manager->GetNumDisplays());
 
   wm::WindowState* window_state = wm::GetWindowState(w1.get());
   const wm::WMEvent toggle_fullscreen_event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   window_state->OnWMEvent(&toggle_fullscreen_event);
   EXPECT_TRUE(window_state->IsFullscreen());
   EXPECT_EQ("0,0 250x250", w1->bounds().ToString());
@@ skipping 72 matching lines @@
 
   // No change
   UpdateDisplay("400x500*2,300x300");
   // We still call into Pre/PostDisplayConfigurationChange().
   EXPECT_EQ(1, observer.CountAndReset());
   EXPECT_EQ(0, observer.GetFocusChangedCountAndReset());
   EXPECT_EQ(0, observer.GetActivationChangedCountAndReset());
 
   // Rotation
   observer.GetRotationChangedCountAndReset();  // we only want to reset.
-  int64 primary_id = GetPrimaryDisplay().id();
+  int64_t primary_id = GetPrimaryDisplay().id();
   display_manager->SetDisplayRotation(primary_id, gfx::Display::ROTATE_90,
                                       gfx::Display::ROTATION_SOURCE_ACTIVE);
   EXPECT_EQ(1, observer.GetRotationChangedCountAndReset());
   EXPECT_EQ(1, observer.CountAndReset());
   EXPECT_EQ(0, observer.GetFocusChangedCountAndReset());
   EXPECT_EQ(0, observer.GetActivationChangedCountAndReset());
   display_manager->SetDisplayRotation(primary_id, gfx::Display::ROTATE_90,
                                       gfx::Display::ROTATION_SOURCE_ACTIVE);
   EXPECT_EQ(0, observer.GetRotationChangedCountAndReset());
   EXPECT_EQ(0, observer.CountAndReset());
   EXPECT_EQ(0, observer.GetFocusChangedCountAndReset());
   EXPECT_EQ(0, observer.GetActivationChangedCountAndReset());
 
   // UI scale is eanbled only on internal display.
-  int64 secondary_id = GetSecondaryDisplay().id();
+  int64_t secondary_id = GetSecondaryDisplay().id();
   test::ScopedSetInternalDisplayId set_internal(secondary_id);
   // Changing internal ID display changes the DisplayIdPair (it comes
   // first), which also changes the primary display candidate.  Update
   // the primary display manually to update the primary display to
   // avoid getting the OnDisplayConfigurationChanged() call twice in
   // SetDisplayUIScale. Note that this scenario will never happen on
   // real devices.
   Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
       secondary_id);
   EXPECT_EQ(1, observer.CountAndReset());
@@ skipping 326 matching lines @@
 TEST_F(WindowTreeHostManagerTest, Rotate) {
   if (!SupportsMultipleDisplays())
     return;
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("120x200,300x400*2");
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
-  int64 display2_id = ScreenUtil::GetSecondaryDisplay().id();
+  int64_t display2_id = ScreenUtil::GetSecondaryDisplay().id();
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   ui::test::EventGenerator generator1(root_windows[0]);
 
   TestObserver observer;
   EXPECT_EQ("120x200", root_windows[0]->bounds().size().ToString());
   EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString());
   EXPECT_EQ("120,0 150x200",
             ScreenUtil::GetSecondaryDisplay().bounds().ToString());
   generator1.MoveMouseToInHost(50, 40);
   EXPECT_EQ("50,40", event_handler.GetLocationAndReset());
@@ skipping 180 matching lines @@
 }
 
 // Make sure that the compositor based mirroring can switch
 // from/to dock mode.
 TEST_F(WindowTreeHostManagerTest, DockToSingle) {
   if (!SupportsMultipleDisplays())
     return;
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
-  const int64 internal_id = 1;
+  const int64_t internal_id = 1;
 
   const DisplayInfo internal_display_info =
       CreateDisplayInfo(internal_id, 0, gfx::Display::ROTATE_0);
   const DisplayInfo external_display_info =
       CreateDisplayInfo(2, 1, gfx::Display::ROTATE_90);
 
   std::vector<DisplayInfo> display_info_list;
   // Extended
   display_info_list.push_back(internal_display_info);
   display_info_list.push_back(external_display_info);
   display_manager->OnNativeDisplaysChanged(display_info_list);
-  const int64 internal_display_id =
+  const int64_t internal_display_id =
       test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
   EXPECT_EQ(internal_id, internal_display_id);
   EXPECT_EQ(2U, display_manager->GetNumDisplays());
 
   // Dock mode.
   display_info_list.clear();
   display_info_list.push_back(external_display_info);
   display_manager->OnNativeDisplaysChanged(display_info_list);
   EXPECT_EQ(1U, display_manager->GetNumDisplays());
   EXPECT_FALSE(Shell::GetPrimaryRootWindow()
@@ skipping 88 matching lines @@
   const DisplayInfo second_display_info =
       CreateDisplayInfo(11, 500, gfx::Display::ROTATE_0);
 
   std::vector<DisplayInfo> display_info_list;
   // Extended
   display_info_list.push_back(first_display_info);
   display_info_list.push_back(second_display_info);
   display_manager->OnNativeDisplaysChanged(display_info_list);
   aura::Window* primary_root = Shell::GetAllRootWindows()[0];
 
-  int64 new_display_id = 20;
+  int64_t new_display_id = 20;
   RootWindowTestObserver test_observer;
   primary_root->AddObserver(&test_observer);
 
   display_info_list.clear();
   const DisplayInfo new_first_display_info =
       CreateDisplayInfo(new_display_id, 0, gfx::Display::ROTATE_0);
 
   display_info_list.push_back(new_first_display_info);
   display_manager->OnNativeDisplaysChanged(display_info_list);
   EXPECT_EQ("0,0 500x500", test_observer.shelf_display_bounds().ToString());
@@ skipping 175 matching lines @@
       widget->GetNativeWindow()->GetRootWindow());
   event_generator.MoveMouseToCenterOf(widget->GetNativeWindow());
 
   UpdateDisplay("300x300");
   watcher.Stop();
 
   widget->CloseNow();
 }
 
 }  // namespace ash