Switch to standard integer types in ash/.

ash/touch/touch_observer_hud_unittest.cc

 // Copyright (c) 2013 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/touch/touch_observer_hud.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 100 matching lines @@
     display_info_list_.push_back(internal_display_info_);
     GetDisplayManager()->OnNativeDisplaysChanged(display_info_list_);
   }
 
   void AddExternalDisplay() {
     DCHECK_EQ(1U, display_info_list_.size());
     display_info_list_.push_back(external_display_info_);
     GetDisplayManager()->OnNativeDisplaysChanged(display_info_list_);
   }
 
-  int64 internal_display_id() const {
-    return internal_display_id_;
-  }
+  int64_t internal_display_id() const { return internal_display_id_; }
 
-  int64 external_display_id() const {
-    return external_display_id_;
-  }
+  int64_t external_display_id() const { return external_display_id_; }
 
  protected:
   DisplayManager* GetDisplayManager() {
     return Shell::GetInstance()->display_manager();
   }
 
   WindowTreeHostManager* GetWindowTreeHostManager() {
     return Shell::GetInstance()->window_tree_host_manager();
   }
 
@@ skipping 38 matching lines @@
   RootWindowController* GetPrimaryRootController() {
     aura::Window* root = GetPrimaryRootWindow();
     return GetRootWindowController(root);
   }
 
   RootWindowController* GetSecondaryRootController() {
     aura::Window* root = GetSecondaryRootWindow();
     return GetRootWindowController(root);
   }
 
-  DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
+  DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
     DisplayInfo info(id, base::StringPrintf("x-%" PRId64, id), false);
     info.SetBounds(bounds);
     return info;
   }
 
   aura::Window* GetRootWindowForTouchHud(TouchObserverHUD* hud) {
     return hud->root_window_;
   }
 
   views::Widget* GetWidgetForTouchHud(TouchObserverHUD* hud) {
     return hud->widget_;
   }
 
-  int64 internal_display_id_;
-  int64 external_display_id_;
-  int64 mirrored_display_id_;
+  int64_t internal_display_id_;
+  int64_t external_display_id_;
+  int64_t mirrored_display_id_;
   DisplayInfo internal_display_info_;
   DisplayInfo external_display_info_;
   DisplayInfo mirrored_display_info_;
 
   std::vector<DisplayInfo> display_info_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudTestBase);
 };
 
 class TouchHudDebugTest : public TouchHudTestBase {
@@ skipping 372 matching lines @@
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 }  // namespace ash