Switch to standard integer types in ash/.

BUG=138542
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/1540753002

Cr-Commit-Position: refs/heads/master@{#366304}

351 files changed, 661 insertions, 431 deletions

diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc
index 83e5d26..23a46e3 100644
--- a/ash/accelerators/accelerator_commands.cc
+++ b/ash/accelerators/accelerator_commands.cc
@@ -72,9 +72,9 @@ bool ZoomInternalDisplay(bool up) {
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
-  int64 display_id = display_manager->IsInUnifiedMode()
-                         ? DisplayManager::kUnifiedDisplayId
-                         : display_manager->GetDisplayIdForUIScaling();
+  int64_t display_id = display_manager->IsInUnifiedMode()
+                           ? DisplayManager::kUnifiedDisplayId
+                           : display_manager->GetDisplayIdForUIScaling();
   const DisplayInfo& display_info = display_manager->GetDisplayInfo(display_id);
   DisplayMode mode;
 
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
index 79cc673..2304f08 100644
--- a/ash/accelerators/accelerator_controller.h
+++ b/ash/accelerators/accelerator_controller.h
@@ -5,15 +5,17 @@
 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <set>
 
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/accelerators/exit_warning_handler.h"
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_history.h"
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index e9dac97..c855bf4 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -5,7 +5,7 @@
 #include "ash/accelerators/accelerator_table.h"
 
 #include "ash/strings/grit/ash_strings.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index 3619ccd..0267e92 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -5,8 +5,9 @@
 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 
+#include <stddef.h>
+
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
diff --git a/ash/accelerators/accelerator_table_unittest.cc b/ash/accelerators/accelerator_table_unittest.cc
index c8878fd..747c2d0 100644
--- a/ash/accelerators/accelerator_table_unittest.cc
+++ b/ash/accelerators/accelerator_table_unittest.cc
@@ -5,7 +5,6 @@
 #include <set>
 
 #include "ash/accelerators/accelerator_table.h"
-#include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc
index 21e4aff..e60bb4d 100644
--- a/ash/accelerators/exit_warning_handler.cc
+++ b/ash/accelerators/exit_warning_handler.cc
@@ -28,7 +28,7 @@
 namespace ash {
 namespace {
 
-const int64 kTimeOutMilliseconds = 2000;
+const int64_t kTimeOutMilliseconds = 2000;
 // Color of the text of the warning message.
 const SkColor kTextColor = SK_ColorWHITE;
 // Color of the window background.
diff --git a/ash/accelerators/exit_warning_handler.h b/ash/accelerators/exit_warning_handler.h
index 7de5fc8..fb9d721 100644
--- a/ash/accelerators/exit_warning_handler.h
+++ b/ash/accelerators/exit_warning_handler.h
@@ -6,6 +6,7 @@
 #define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/base/accelerators/accelerator.h"
diff --git a/ash/accelerators/focus_manager_factory.h b/ash/accelerators/focus_manager_factory.h
index fc14151..202f230 100644
--- a/ash/accelerators/focus_manager_factory.h
+++ b/ash/accelerators/focus_manager_factory.h
@@ -5,8 +5,8 @@
 #ifndef ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
 #define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/focus/focus_manager_delegate.h"
 #include "ui/views/focus/focus_manager_factory.h"
 
diff --git a/ash/accelerators/key_hold_detector.h b/ash/accelerators/key_hold_detector.h
index 4a21547..f50a35c 100644
--- a/ash/accelerators/key_hold_detector.h
+++ b/ash/accelerators/key_hold_detector.h
@@ -6,6 +6,7 @@
 #define ASH_ACCELERATOR_KEY_HOLD_DETECTOR_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/accelerators/magnifier_key_scroller.h b/ash/accelerators/magnifier_key_scroller.h
index 41f5ce15..40fbd9e 100644
--- a/ash/accelerators/magnifier_key_scroller.h
+++ b/ash/accelerators/magnifier_key_scroller.h
@@ -7,6 +7,7 @@
 
 #include "ash/accelerators/key_hold_detector.h"
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/accelerators/spoken_feedback_toggler.h b/ash/accelerators/spoken_feedback_toggler.h
index dd0bb99..5b2b7d0 100644
--- a/ash/accelerators/spoken_feedback_toggler.h
+++ b/ash/accelerators/spoken_feedback_toggler.h
@@ -7,6 +7,7 @@
 
 #include "ash/accelerators/key_hold_detector.h"
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/ash_touch_exploration_manager_chromeos.h b/ash/ash_touch_exploration_manager_chromeos.h
index 6c9fcf4..95ae487 100644
--- a/ash/ash_touch_exploration_manager_chromeos.h
+++ b/ash/ash_touch_exploration_manager_chromeos.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/tray_accessibility.h"
+#include "base/macros.h"
 #include "ui/chromeos/touch_exploration_controller.h"
 
 namespace chromeos {
diff --git a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
index de926fab..b0038ed 100644
--- a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
+++ b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
@@ -40,7 +40,7 @@ namespace {
 const float kDegreesToRadians = 3.1415926f / 180.0f;
 const float kMeanGravity = -9.8066f;
 
-DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
+DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
   DisplayInfo info(id, "dummy", false);
   info.SetBounds(bounds);
   return info;
@@ -58,7 +58,8 @@ bool RotationLocked() {
       ->rotation_locked();
 }
 
-void SetDisplayRotationById(int64 display_id, gfx::Display::Rotation rotation) {
+void SetDisplayRotationById(int64_t display_id,
+                            gfx::Display::Rotation rotation) {
   Shell::GetInstance()->display_manager()->SetDisplayRotation(
       display_id, rotation, gfx::Display::ROTATION_SOURCE_USER);
 }
@@ -596,7 +597,7 @@ TEST_F(ScreenOrientationControllerTest, UserRotationLockDisallowsRotation) {
 TEST_F(ScreenOrientationControllerTest, InternalDisplayNotAvailableAtStartup) {
   test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
 
-  int64 internal_display_id = gfx::Display::InternalDisplayId();
+  int64_t internal_display_id = gfx::Display::InternalDisplayId();
   gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
 
   EnableMaximizeMode(true);
@@ -618,8 +619,8 @@ TEST_F(ScreenOrientationControllerTest, InternalDisplayNotAvailableAtStartup) {
 
 // Verifies rotating an inactive Display is successful.
 TEST_F(ScreenOrientationControllerTest, RotateInactiveDisplay) {
-  const int64 kInternalDisplayId = 9;
-  const int64 kExternalDisplayId = 10;
+  const int64_t kInternalDisplayId = 9;
+  const int64_t kExternalDisplayId = 10;
   const gfx::Display::Rotation kNewRotation = gfx::Display::ROTATE_180;
 
   const DisplayInfo internal_display_info =
diff --git a/ash/content/gpu_support_impl.h b/ash/content/gpu_support_impl.h
index f1c1572..422d331 100644
--- a/ash/content/gpu_support_impl.h
+++ b/ash/content/gpu_support_impl.h
@@ -7,6 +7,7 @@
 
 #include "ash/content/ash_with_content_export.h"
 #include "ash/gpu_support.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_delegate.h b/ash/content/keyboard_overlay/keyboard_overlay_delegate.h
index eebc044..0a7edf4 100644
--- a/ash/content/keyboard_overlay/keyboard_overlay_delegate.h
+++ b/ash/content/keyboard_overlay/keyboard_overlay_delegate.h
@@ -6,9 +6,9 @@
 #define ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_DELEGATE_H_
 
 #include "ash/content/ash_with_content_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "url/gurl.h"
 
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_view.h b/ash/content/keyboard_overlay/keyboard_overlay_view.h
index 5d8c1af..2f709c2 100644
--- a/ash/content/keyboard_overlay/keyboard_overlay_view.h
+++ b/ash/content/keyboard_overlay/keyboard_overlay_view.h
@@ -11,6 +11,7 @@
 #include "ash/wm/overlay_event_filter.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "ui/views/controls/webview/web_dialog_view.h"
 
 class GURL;
diff --git a/ash/content/screen_orientation_delegate_chromeos.h b/ash/content/screen_orientation_delegate_chromeos.h
index ce96841..d5fe51c 100644
--- a/ash/content/screen_orientation_delegate_chromeos.h
+++ b/ash/content/screen_orientation_delegate_chromeos.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/browser/screen_orientation_delegate.h"
-
 #ifndef ASH_CONTENT_SCREEN_ORIENTATION_DELEGATE_CHROMEOS_H_
 #define ASH_CONTENT_SCREEN_ORIENTATION_DELEGATE_CHROMEOS_H_
 
+#include "content/public/browser/screen_orientation_delegate.h"
+
+#include "base/macros.h"
+
 namespace ash {
 
 class ScreenOrientationDelegateChromeos
diff --git a/ash/default_accessibility_delegate.h b/ash/default_accessibility_delegate.h
index 5680fc0..e973f56 100644
--- a/ash/default_accessibility_delegate.h
+++ b/ash/default_accessibility_delegate.h
@@ -7,8 +7,8 @@
 
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/default_user_wallpaper_delegate.h b/ash/default_user_wallpaper_delegate.h
index fbbccde..80e20b1 100644
--- a/ash/default_user_wallpaper_delegate.h
+++ b/ash/default_user_wallpaper_delegate.h
@@ -7,8 +7,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index 8b75b48..46e1c7c 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -8,9 +8,9 @@
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell_observer.h"
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h
index 1c76351..a12a68f 100644
--- a/ash/desktop_background/desktop_background_view.h
+++ b/ash/desktop_background/desktop_background_view.h
@@ -5,6 +5,7 @@
 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
 
+#include "base/macros.h"
 #include "ui/events/event.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/context_menu_controller.h"
diff --git a/ash/desktop_background/desktop_background_widget_controller.h b/ash/desktop_background/desktop_background_widget_controller.h
index bad030c..6806455 100644
--- a/ash/desktop_background/desktop_background_widget_controller.h
+++ b/ash/desktop_background/desktop_background_widget_controller.h
@@ -6,6 +6,7 @@
 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_WIDGET_CONTROLLER_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
diff --git a/ash/display/cursor_window_controller.h b/ash/display/cursor_window_controller.h
index ae6752f..447be03 100644
--- a/ash/display/cursor_window_controller.h
+++ b/ash/display/cursor_window_controller.h
@@ -6,6 +6,7 @@
 #define ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/display.h"
diff --git a/ash/display/cursor_window_controller_unittest.cc b/ash/display/cursor_window_controller_unittest.cc
index d1f9445..5640bb1 100644
--- a/ash/display/cursor_window_controller_unittest.cc
+++ b/ash/display/cursor_window_controller_unittest.cc
@@ -44,7 +44,7 @@ class CursorWindowControllerTest : public test::AshTestBase {
     return cursor_window_controller_->GetCursorImageForTest();
   }
 
-  int64 GetCursorDisplayId() const {
+  int64_t GetCursorDisplayId() const {
     return cursor_window_controller_->display_.id();
   }
 
@@ -72,8 +72,8 @@ TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) {
 
   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 =
@@ -154,7 +154,7 @@ TEST_F(CursorWindowControllerTest, VisibilityTest) {
 // 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);
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 3ff8670..8b3d617 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -164,7 +164,7 @@ ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
                            ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
 }
 
-bool DisplayChangeObserver::GetResolutionForDisplayId(int64 display_id,
+bool DisplayChangeObserver::GetResolutionForDisplayId(int64_t display_id,
                                                       gfx::Size* size) const {
   DisplayMode mode;
   if (!Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
@@ -180,7 +180,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
   UpdateInternalDisplayId(display_states);
 
   std::vector<DisplayInfo> displays;
-  std::set<int64> ids;
+  std::set<int64_t> ids;
   for (const ui::DisplaySnapshot* state : display_states) {
     const ui::DisplayMode* mode_info = state->current_mode();
     if (!mode_info)
@@ -234,7 +234,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
       name = l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
 
     bool has_overscan = state->has_overscan();
-    int64 id = state->display_id();
+    int64_t id = state->display_id();
     ids.insert(id);
 
     displays.push_back(DisplayInfo(id, name, has_overscan));
diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
index 7b9dd12..d63a732 100644
--- a/ash/display/display_change_observer_chromeos.h
+++ b/ash/display/display_change_observer_chromeos.h
@@ -5,11 +5,13 @@
 #ifndef ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
 #define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/events/devices/input_device_event_observer.h"
 
@@ -41,7 +43,7 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
   // ui::DisplayConfigurator::StateController overrides:
   ui::MultipleDisplayState GetStateForDisplayIds(
       const ui::DisplayConfigurator::DisplayStateList& outputs) const override;
-  bool GetResolutionForDisplayId(int64 display_id,
+  bool GetResolutionForDisplayId(int64_t display_id,
                                  gfx::Size* size) const override;
 
   // Overriden from ui::DisplayConfigurator::Observer:
diff --git a/ash/display/display_color_manager_chromeos.h b/ash/display/display_color_manager_chromeos.h
index 0613a9e..b434e05 100644
--- a/ash/display/display_color_manager_chromeos.h
+++ b/ash/display/display_color_manager_chromeos.h
@@ -5,12 +5,14 @@
 #ifndef ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
 #define ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/gfx/display.h"
diff --git a/ash/display/display_configurator_animation.h b/ash/display/display_configurator_animation.h
index 2dcc0bd..567c9f1 100644
--- a/ash/display/display_configurator_animation.h
+++ b/ash/display/display_configurator_animation.h
@@ -9,6 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/display/chromeos/display_configurator.h"
diff --git a/ash/display/display_error_observer_chromeos.h b/ash/display/display_error_observer_chromeos.h
index aeb9177..5962357 100644
--- a/ash/display/display_error_observer_chromeos.h
+++ b/ash/display/display_error_observer_chromeos.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/display/chromeos/display_configurator.h"
 
diff --git a/ash/display/display_info.cc b/ash/display/display_info.cc
index b074803..b89d4d5 100644
--- a/ash/display/display_info.cc
+++ b/ash/display/display_info.cc
@@ -25,9 +25,9 @@ namespace ash {
 namespace {
 
 // Use larger than max int to catch overflow early.
-const int64 kSynthesizedDisplayIdStart = 2200000000LL;
+const int64_t kSynthesizedDisplayIdStart = 2200000000LL;
 
-int64 synthesized_display_id = kSynthesizedDisplayIdStart;
+int64_t synthesized_display_id = kSynthesizedDisplayIdStart;
 
 const float kDpi96 = 96.0;
 bool use_125_dsf_for_ui_scaling = true;
@@ -112,7 +112,7 @@ DisplayInfo DisplayInfo::CreateFromSpec(const std::string& spec) {
 
 // static
 DisplayInfo DisplayInfo::CreateFromSpecWithID(const std::string& spec,
-                                              int64 id) {
+                                              int64_t id) {
 #if defined(OS_WIN)
   gfx::Rect bounds_in_native(
       gfx::Size(GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)));
@@ -247,7 +247,7 @@ DisplayInfo::DisplayInfo()
       clear_overscan_insets_(false),
       color_profile_(ui::COLOR_PROFILE_STANDARD) {}
 
-DisplayInfo::DisplayInfo(int64 id, const std::string& name, bool has_overscan)
+DisplayInfo::DisplayInfo(int64_t id, const std::string& name, bool has_overscan)
     : id_(id),
       name_(name),
       has_overscan_(has_overscan),
diff --git a/ash/display/display_info.h b/ash/display/display_info.h
index 57cd18a..8eab3e2 100644
--- a/ash/display/display_info.h
+++ b/ash/display/display_info.h
@@ -5,6 +5,8 @@
 #ifndef ASH_DISPLAY_DISPLAY_INFO_H_
 #define ASH_DISPLAY_DISPLAY_INFO_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
@@ -83,8 +85,7 @@ class ASH_EXPORT DisplayInfo {
   static DisplayInfo CreateFromSpec(const std::string& spec);
 
   // Creates a DisplayInfo from string spec using given |id|.
-  static DisplayInfo CreateFromSpecWithID(const std::string& spec,
-                                          int64 id);
+  static DisplayInfo CreateFromSpecWithID(const std::string& spec, int64_t id);
 
   // When this is set to true on the device whose internal display has
   // 1.25 dsf, Chrome uses 1.0f as a default scale factor, and uses
@@ -92,10 +93,10 @@ class ASH_EXPORT DisplayInfo {
   static void SetUse125DSFForUIScalingForTest(bool enable);
 
   DisplayInfo();
-  DisplayInfo(int64 id, const std::string& name, bool has_overscan);
+  DisplayInfo(int64_t id, const std::string& name, bool has_overscan);
   ~DisplayInfo();
 
-  int64 id() const { return id_; }
+  int64_t id() const { return id_; }
 
   // The name of the display.
   const std::string& name() const { return name_; }
@@ -247,7 +248,7 @@ class ASH_EXPORT DisplayInfo {
   // SetUse125DSFForUIScaling(true) is called and this is the internal display.
   bool Use125DSFForUIScaling() const;
 
-  int64 id_;
+  int64_t id_;
   std::string name_;
   bool has_overscan_;
   std::map<gfx::Display::RotationSource, gfx::Display::Rotation> rotations_;
diff --git a/ash/display/display_layout.cc b/ash/display/display_layout.cc
index 9816f21..84882a5 100644
--- a/ash/display/display_layout.cc
+++ b/ash/display/display_layout.cc
@@ -55,7 +55,7 @@ std::string GetStringFromPosition(DisplayLayout::Position position) {
   return iter != map->end() ? iter->second : std::string("unknown");
 }
 
-bool GetDisplayIdFromString(const base::StringPiece& position, int64* field) {
+bool GetDisplayIdFromString(const base::StringPiece& position, int64_t* field) {
   return base::StringToInt64(position, field);
 }
 
@@ -166,7 +166,7 @@ void DisplayLayout::RegisterJSONConverter(
   converter->RegisterBoolField(kMirroredKey, &DisplayLayout::mirrored);
   converter->RegisterBoolField(kDefaultUnifiedKey,
                                &DisplayLayout::default_unified);
-  converter->RegisterCustomField<int64>(
+  converter->RegisterCustomField<int64_t>(
       kPrimaryIdKey, &DisplayLayout::primary_id, &GetDisplayIdFromString);
 }
 
diff --git a/ash/display/display_layout.h b/ash/display/display_layout.h
index e5623f4..23e5779 100644
--- a/ash/display/display_layout.h
+++ b/ash/display/display_layout.h
@@ -5,11 +5,12 @@
 #ifndef ASH_DISPLAY_DISPLAY_LAYOUT_H_
 #define ASH_DISPLAY_DISPLAY_LAYOUT_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
 namespace base {
@@ -19,7 +20,7 @@ template <typename T> class JSONValueConverter;
 
 namespace ash {
 
-typedef std::pair<int64, int64> DisplayIdPair;
+typedef std::pair<int64_t, int64_t> DisplayIdPair;
 
 struct ASH_EXPORT DisplayLayout {
   // Layout options where the secondary display should be positioned.
@@ -63,7 +64,7 @@ struct ASH_EXPORT DisplayLayout {
   bool default_unified;
 
   // The id of the display used as a primary display.
-  int64 primary_id;
+  int64_t primary_id;
 
   // Returns string representation of the layout for debugging/testing.
   // This includes "unified" only if the unified desktop feature is enabled.
diff --git a/ash/display/display_layout_store.cc b/ash/display/display_layout_store.cc
index c002e04..aacbf62 100644
--- a/ash/display/display_layout_store.cc
+++ b/ash/display/display_layout_store.cc
@@ -46,8 +46,8 @@ void DisplayLayoutStore::SetDefaultDisplayLayout(const DisplayLayout& layout) {
 }
 
 void DisplayLayoutStore::RegisterLayoutForDisplayIdPair(
-    int64 id1,
-    int64 id2,
+    int64_t id1,
+    int64_t id2,
     const DisplayLayout& layout) {
   auto key = CreateDisplayIdPair(id1, id2);
   paired_layouts_[key] = layout;
@@ -81,7 +81,7 @@ void DisplayLayoutStore::UpdateMultiDisplayState(const DisplayIdPair& pair,
 }
 
 void DisplayLayoutStore::UpdatePrimaryDisplayId(const DisplayIdPair& pair,
-                                                int64 display_id) {
+                                                int64_t display_id) {
   if (paired_layouts_.find(pair) == paired_layouts_.end())
     CreateDisplayLayout(pair);
   paired_layouts_[pair].primary_id = display_id;
diff --git a/ash/display/display_layout_store.h b/ash/display/display_layout_store.h
index 6841ea9..7519ec4 100644
--- a/ash/display/display_layout_store.h
+++ b/ash/display/display_layout_store.h
@@ -5,10 +5,13 @@
 #ifndef ASH_DISPLAY_DISPLAY_LAYOUT_STORE_H_
 #define ASH_DISPLAY_DISPLAY_LAYOUT_STORE_H_
 
+#include <stdint.h>
+
 #include <map>
 
 #include "ash/ash_export.h"
 #include "ash/display/display_layout.h"
+#include "base/macros.h"
 
 namespace ash {
 
@@ -23,8 +26,8 @@ class ASH_EXPORT DisplayLayoutStore {
   void SetDefaultDisplayLayout(const DisplayLayout& layout);
 
   // Registeres the display layout info for the specified display(s).
-  void RegisterLayoutForDisplayIdPair(int64 id1,
-                                      int64 id2,
+  void RegisterLayoutForDisplayIdPair(int64_t id1,
+                                      int64_t id2,
                                       const DisplayLayout& layout);
 
   // If no layout is registered, it creatas new layout using
@@ -48,7 +51,7 @@ class ASH_EXPORT DisplayLayoutStore {
   // |display_pair|.  This creates new display layout if no layout is
   // registered for |display_pair|.
   void UpdatePrimaryDisplayId(const DisplayIdPair& display_pair,
-                              int64 display_id);
+                              int64_t display_id);
 
  private:
   // Creates new layout for display pair from |default_display_layout_|.
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 14c7383..fe7f243 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -101,7 +101,7 @@ void SetInternalDisplayModeList(DisplayInfo* info) {
 }
 
 void MaybeInitInternalDisplay(DisplayInfo* info) {
-  int64 id = info->id();
+  int64_t id = info->id();
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kAshUseFirstDisplayAsInternal)) {
     gfx::Display::SetInternalDisplayId(id);
@@ -124,7 +124,7 @@ using std::string;
 using std::vector;
 
 // static
-int64 DisplayManager::kUnifiedDisplayId = -10;
+int64_t DisplayManager::kUnifiedDisplayId = -10;
 
 DisplayManager::DisplayManager()
     : delegate_(NULL),
@@ -284,7 +284,7 @@ void DisplayManager::SetLayoutForCurrentDisplays(
   }
 }
 
-const gfx::Display& DisplayManager::GetDisplayForId(int64 id) const {
+const gfx::Display& DisplayManager::GetDisplayForId(int64_t id) const {
   gfx::Display* display =
       const_cast<DisplayManager*>(this)->FindDisplayForId(id);
   return display ? *display : GetInvalidDisplay();
@@ -297,7 +297,7 @@ const gfx::Display& DisplayManager::FindDisplayContainingPoint(
   return index < 0 ? GetInvalidDisplay() : active_display_list_[index];
 }
 
-bool DisplayManager::UpdateWorkAreaOfDisplay(int64 display_id,
+bool DisplayManager::UpdateWorkAreaOfDisplay(int64_t display_id,
                                              const gfx::Insets& insets) {
   gfx::Display* display = FindDisplayForId(display_id);
   DCHECK(display);
@@ -306,7 +306,7 @@ bool DisplayManager::UpdateWorkAreaOfDisplay(int64 display_id,
   return old_work_area != display->work_area();
 }
 
-void DisplayManager::SetOverscanInsets(int64 display_id,
+void DisplayManager::SetOverscanInsets(int64_t display_id,
                                        const gfx::Insets& insets_in_dip) {
   bool update = false;
   DisplayInfoList display_info_list;
@@ -331,7 +331,7 @@ void DisplayManager::SetOverscanInsets(int64 display_id,
   }
 }
 
-void DisplayManager::SetDisplayRotation(int64 display_id,
+void DisplayManager::SetDisplayRotation(int64_t display_id,
                                         gfx::Display::Rotation rotation,
                                         gfx::Display::RotationSource source) {
   if (IsInUnifiedMode())
@@ -360,7 +360,7 @@ void DisplayManager::SetDisplayRotation(int64 display_id,
   }
 }
 
-bool DisplayManager::SetDisplayMode(int64 display_id,
+bool DisplayManager::SetDisplayMode(int64_t display_id,
                                     const DisplayMode& display_mode) {
   bool change_ui_scale = GetDisplayIdForUIScaling() == display_id;
 
@@ -411,7 +411,7 @@ bool DisplayManager::SetDisplayMode(int64 display_id,
 }
 
 void DisplayManager::RegisterDisplayProperty(
-    int64 display_id,
+    int64_t display_id,
     gfx::Display::Rotation rotation,
     float ui_scale,
     const gfx::Insets* overscan_insets,
@@ -447,7 +447,8 @@ void DisplayManager::RegisterDisplayProperty(
   }
 }
 
-DisplayMode DisplayManager::GetActiveModeForDisplayId(int64 display_id) const {
+DisplayMode DisplayManager::GetActiveModeForDisplayId(
+    int64_t display_id) const {
   DisplayMode selected_mode;
   if (GetSelectedModeForDisplayId(display_id, &selected_mode))
     return selected_mode;
@@ -480,9 +481,9 @@ void DisplayManager::RegisterDisplayRotationProperties(bool rotation_lock,
     delegate_->PostDisplayConfigurationChange();
 }
 
-bool DisplayManager::GetSelectedModeForDisplayId(int64 id,
+bool DisplayManager::GetSelectedModeForDisplayId(int64_t id,
                                                  DisplayMode* mode_out) const {
-  std::map<int64, DisplayMode>::const_iterator iter = display_modes_.find(id);
+  std::map<int64_t, DisplayMode>::const_iterator iter = display_modes_.find(id);
   if (iter == display_modes_.end())
     return false;
   *mode_out = iter->second;
@@ -493,15 +494,15 @@ bool DisplayManager::IsDisplayUIScalingEnabled() const {
   return GetDisplayIdForUIScaling() != gfx::Display::kInvalidDisplayID;
 }
 
-gfx::Insets DisplayManager::GetOverscanInsets(int64 display_id) const {
-  std::map<int64, DisplayInfo>::const_iterator it =
+gfx::Insets DisplayManager::GetOverscanInsets(int64_t display_id) const {
+  std::map<int64_t, DisplayInfo>::const_iterator it =
       display_info_.find(display_id);
   return (it != display_info_.end()) ?
       it->second.overscan_insets_in_dip() : gfx::Insets();
 }
 
 void DisplayManager::SetColorCalibrationProfile(
-    int64 display_id,
+    int64_t display_id,
     ui::ColorCalibrationProfile profile) {
 #if defined(OS_CHROMEOS)
   if (!display_info_[display_id].IsColorProfileAvailable(profile))
@@ -870,7 +871,7 @@ size_t DisplayManager::GetNumDisplays() const {
   return active_display_list_.size();
 }
 
-bool DisplayManager::IsActiveDisplayId(int64 display_id) const {
+bool DisplayManager::IsActiveDisplayId(int64_t display_id) const {
   return std::find_if(active_display_list_.begin(), active_display_list_.end(),
                       [display_id](const gfx::Display& display) {
                         return display.id() == display_id;
@@ -895,17 +896,17 @@ bool DisplayManager::IsInUnifiedMode() const {
          !software_mirroring_display_list_.empty();
 }
 
-const DisplayInfo& DisplayManager::GetDisplayInfo(int64 display_id) const {
+const DisplayInfo& DisplayManager::GetDisplayInfo(int64_t display_id) const {
   DCHECK_NE(gfx::Display::kInvalidDisplayID, display_id);
 
-  std::map<int64, DisplayInfo>::const_iterator iter =
+  std::map<int64_t, DisplayInfo>::const_iterator iter =
       display_info_.find(display_id);
   CHECK(iter != display_info_.end()) << display_id;
   return iter->second;
 }
 
 const gfx::Display DisplayManager::GetMirroringDisplayById(
-    int64 display_id) const {
+    int64_t display_id) const {
   auto iter = std::find_if(software_mirroring_display_list_.begin(),
                            software_mirroring_display_list_.end(),
                            [display_id](const gfx::Display& display) {
@@ -915,18 +916,18 @@ const gfx::Display DisplayManager::GetMirroringDisplayById(
                                                         : *iter;
 }
 
-std::string DisplayManager::GetDisplayNameForId(int64 id) {
+std::string DisplayManager::GetDisplayNameForId(int64_t id) {
   if (id == gfx::Display::kInvalidDisplayID)
     return l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
 
-  std::map<int64, DisplayInfo>::const_iterator iter = display_info_.find(id);
+  std::map<int64_t, DisplayInfo>::const_iterator iter = display_info_.find(id);
   if (iter != display_info_.end() && !iter->second.name().empty())
     return iter->second.name();
 
   return base::StringPrintf("Display %d", static_cast<int>(id));
 }
 
-int64 DisplayManager::GetDisplayIdForUIScaling() const {
+int64_t DisplayManager::GetDisplayIdForUIScaling() const {
   // UI Scaling is effective on internal display.
   return gfx::Display::HasInternalDisplay() ? gfx::Display::InternalDisplayId()
                                             : gfx::Display::kInvalidDisplayID;
@@ -1038,7 +1039,7 @@ void DisplayManager::ReconfigureDisplays() {
   UpdateDisplays(display_info_list);
 }
 
-bool DisplayManager::UpdateDisplayBounds(int64 display_id,
+bool DisplayManager::UpdateDisplayBounds(int64_t display_id,
                                          const gfx::Rect& new_bounds) {
   if (change_display_upon_host_resize_) {
     display_info_[display_id].SetBounds(new_bounds);
@@ -1114,7 +1115,7 @@ void DisplayManager::CreateSoftwareMirroringDisplayInfo(
         mirroring_display_id_ =
             (*display_info_list)[zero_is_source ? 1 : 0].id();
 
-        int64 display_id = mirroring_display_id_;
+        int64_t display_id = mirroring_display_id_;
         auto iter =
             std::find_if(display_info_list->begin(), display_info_list->end(),
                          [display_id](const DisplayInfo& info) {
@@ -1230,7 +1231,7 @@ void DisplayManager::CreateSoftwareMirroringDisplayInfo(
   }
 }
 
-gfx::Display* DisplayManager::FindDisplayForId(int64 id) {
+gfx::Display* DisplayManager::FindDisplayForId(int64_t id) {
   auto iter = std::find_if(
       active_display_list_.begin(), active_display_list_.end(),
       [id](const gfx::Display& display) { return display.id() == id; });
@@ -1250,7 +1251,7 @@ void DisplayManager::AddMirrorDisplayInfoIfAny(
 }
 
 void DisplayManager::InsertAndUpdateDisplayInfo(const DisplayInfo& new_info) {
-  std::map<int64, DisplayInfo>::iterator info =
+  std::map<int64_t, DisplayInfo>::iterator info =
       display_info_.find(new_info.id());
   if (info != display_info_.end()) {
     info->second.Copy(new_info);
@@ -1272,7 +1273,7 @@ void DisplayManager::OnDisplayInfoUpdated(const DisplayInfo& display_info) {
 #endif
 }
 
-gfx::Display DisplayManager::CreateDisplayFromDisplayInfoById(int64 id) {
+gfx::Display DisplayManager::CreateDisplayFromDisplayInfoById(int64_t id) {
   DCHECK(display_info_.find(id) != display_info_.end()) << "id=" << id;
   const DisplayInfo& display_info = display_info_[id];
 
@@ -1291,7 +1292,7 @@ gfx::Display DisplayManager::CreateDisplayFromDisplayInfoById(int64 id) {
 }
 
 gfx::Display DisplayManager::CreateMirroringDisplayFromDisplayInfoById(
-    int64 id,
+    int64_t id,
     const gfx::Point& origin,
     float scale) {
   DCHECK(display_info_.find(id) != display_info_.end()) << "id=" << id;
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index 7cdd08c..83933bf 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -5,6 +5,9 @@
 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_
 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
@@ -13,6 +16,7 @@
 #include "ash/display/display_layout.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/gfx/display.h"
@@ -92,7 +96,7 @@ class ASH_EXPORT DisplayManager
   };
 
   // The display ID for a virtual display assigned to a unified desktop.
-  static int64 kUnifiedDisplayId;
+  static int64_t kUnifiedDisplayId;
 
   DisplayManager();
 #if defined(OS_CHROMEOS)
@@ -115,7 +119,7 @@ class ASH_EXPORT DisplayManager
   }
 
   // Returns the display id of the first display in the outupt list.
-  int64 first_display_id() const { return first_display_id_; }
+  int64_t first_display_id() const { return first_display_id_; }
 
   // Initializes displays using command line flag. Returns false
   // if no command line flag was provided.
@@ -140,7 +144,7 @@ class ASH_EXPORT DisplayManager
       const DisplayLayout& layout_relative_to_primary);
 
   // Returns display for given |id|;
-  const gfx::Display& GetDisplayForId(int64 id) const;
+  const gfx::Display& GetDisplayForId(int64_t id) const;
 
   // Finds the display that contains |point| in screeen coordinates.
   // Returns invalid display if there is no display that can satisfy
@@ -149,16 +153,16 @@ class ASH_EXPORT DisplayManager
       const gfx::Point& point_in_screen) const;
 
   // Sets the work area's |insets| to the display given by |display_id|.
-  bool UpdateWorkAreaOfDisplay(int64 display_id, const gfx::Insets& insets);
+  bool UpdateWorkAreaOfDisplay(int64_t display_id, const gfx::Insets& insets);
 
   // Registers the overscan insets for the display of the specified ID. Note
   // that the insets size should be specified in DIP size. It also triggers the
   // display's bounds change.
-  void SetOverscanInsets(int64 display_id, const gfx::Insets& insets_in_dip);
+  void SetOverscanInsets(int64_t display_id, const gfx::Insets& insets_in_dip);
 
   // Sets the display's rotation for the given |source|. The new |rotation| will
   // also become active.
-  void SetDisplayRotation(int64 display_id,
+  void SetDisplayRotation(int64_t display_id,
                           gfx::Display::Rotation rotation,
                           gfx::Display::RotationSource source);
 
@@ -166,11 +170,11 @@ class ASH_EXPORT DisplayManager
   // ui-scale change, and device scale factor change. Returns true if it changes
   // the display resolution so that the caller needs to show a notification in
   // case the new resolution actually doesn't work.
-  bool SetDisplayMode(int64 display_id, const DisplayMode& display_mode);
+  bool SetDisplayMode(int64_t display_id, const DisplayMode& display_mode);
 
   // Register per display properties. |overscan_insets| is NULL if
   // the display has no custom overscan insets.
-  void RegisterDisplayProperty(int64 display_id,
+  void RegisterDisplayProperty(int64_t display_id,
                                gfx::Display::Rotation rotation,
                                float ui_scale,
                                const gfx::Insets* overscan_insets,
@@ -195,11 +199,11 @@ class ASH_EXPORT DisplayManager
   }
 
   // Returns the display mode of |display_id| which is currently used.
-  DisplayMode GetActiveModeForDisplayId(int64 display_id) const;
+  DisplayMode GetActiveModeForDisplayId(int64_t display_id) const;
 
   // Returns the display's selected mode. This returns false and doesn't
   // set |mode_out| if the display mode is in default.
-  bool GetSelectedModeForDisplayId(int64 display_id,
+  bool GetSelectedModeForDisplayId(int64_t display_id,
                                    DisplayMode* mode_out) const;
 
   // Tells if the virtual resolution feature is enabled.
@@ -208,10 +212,10 @@ class ASH_EXPORT DisplayManager
   // Returns the current overscan insets for the specified |display_id|.
   // Returns an empty insets (0, 0, 0, 0) if no insets are specified for
   // the display.
-  gfx::Insets GetOverscanInsets(int64 display_id) const;
+  gfx::Insets GetOverscanInsets(int64_t display_id) const;
 
   // Sets the color calibration of the display to |profile|.
-  void SetColorCalibrationProfile(int64 display_id,
+  void SetColorCalibrationProfile(int64_t display_id,
                                   ui::ColorCalibrationProfile profile);
 
   // Called when display configuration has changed. The new display
@@ -242,7 +246,7 @@ class ASH_EXPORT DisplayManager
 
   // Returns true if the display specified by |display_id| is currently
   // connected and active. (mirroring display isn't active, for example).
-  bool IsActiveDisplayId(int64 display_id) const;
+  bool IsActiveDisplayId(int64_t display_id) const;
 
   // Returns the number of connected displays. This returns 2
   // when displays are mirrored.
@@ -250,7 +254,7 @@ class ASH_EXPORT DisplayManager
 
   // Returns the mirroring status.
   bool IsInMirrorMode() const;
-  int64 mirroring_display_id() const { return mirroring_display_id_; }
+  int64_t mirroring_display_id() const { return mirroring_display_id_; }
   const DisplayList& software_mirroring_display_list() const {
     return software_mirroring_display_list_;
   }
@@ -264,19 +268,19 @@ class ASH_EXPORT DisplayManager
 
   // Returns the display used for software mirrroring. Returns invalid
   // display if not found.
-  const gfx::Display GetMirroringDisplayById(int64 id) const;
+  const gfx::Display GetMirroringDisplayById(int64_t id) const;
 
   // Retuns the display info associated with |display_id|.
-  const DisplayInfo& GetDisplayInfo(int64 display_id) const;
+  const DisplayInfo& GetDisplayInfo(int64_t display_id) const;
 
   // Returns the human-readable name for the display |id|.
-  std::string GetDisplayNameForId(int64 id);
+  std::string GetDisplayNameForId(int64_t id);
 
   // Returns the display id that is capable of UI scaling. On device,
   // this returns internal display's ID if its device scale factor is 2,
   // or invalid ID if such internal display doesn't exist. On linux
   // desktop, this returns the first display ID.
-  int64 GetDisplayIdForUIScaling() const;
+  int64_t GetDisplayIdForUIScaling() const;
 
   // Change the mirror mode.
   void SetMirrorMode(bool mirrored);
@@ -307,8 +311,7 @@ class ASH_EXPORT DisplayManager
   void ReconfigureDisplays();
 
   // Update the bounds of the display given by |display_id|.
-  bool UpdateDisplayBounds(int64 display_id,
-                           const gfx::Rect& new_bounds);
+  bool UpdateDisplayBounds(int64_t display_id, const gfx::Rect& new_bounds);
 
   // Creates mirror window asynchronously if the software mirror mode
   // is enabled.
@@ -356,7 +359,7 @@ private:
   // used to mirror the content is removed from the |display_info_list|.
   void CreateSoftwareMirroringDisplayInfo(DisplayInfoList* display_info_list);
 
-  gfx::Display* FindDisplayForId(int64 id);
+  gfx::Display* FindDisplayForId(int64_t id);
 
   // Add the mirror display's display info if the software based
   // mirroring is in use.
@@ -373,13 +376,13 @@ private:
   void OnDisplayInfoUpdated(const DisplayInfo& display_info);
 
   // Creates a display object from the DisplayInfo for |display_id|.
-  gfx::Display CreateDisplayFromDisplayInfoById(int64 display_id);
+  gfx::Display CreateDisplayFromDisplayInfoById(int64_t display_id);
 
   // Creates a display object from the DisplayInfo for |display_id| for
   // mirroring. The size of the display will be scaled using |scale|
   // with the offset using |origin|.
   gfx::Display CreateMirroringDisplayFromDisplayInfoById(
-      int64 display_id,
+      int64_t display_id,
       const gfx::Point& origin,
       float scale);
 
@@ -408,7 +411,7 @@ private:
 
   scoped_ptr<DisplayLayoutStore> layout_store_;
 
-  int64 first_display_id_;
+  int64_t first_display_id_;
 
   // List of current active displays.
   DisplayList active_display_list_;
@@ -418,10 +421,10 @@ private:
   bool force_bounds_changed_;
 
   // The mapping from the display ID to its internal data.
-  std::map<int64, DisplayInfo> display_info_;
+  std::map<int64_t, DisplayInfo> display_info_;
 
   // Selected display modes for displays. Key is the displays' ID.
-  std::map<int64, DisplayMode> display_modes_;
+  std::map<int64_t, DisplayMode> display_modes_;
 
   // When set to true, the host window's resize event updates
   // the display's size. This is set to true when running on
@@ -433,7 +436,7 @@ private:
   MultiDisplayMode multi_display_mode_;
   MultiDisplayMode current_default_multi_display_mode_;
 
-  int64 mirroring_display_id_;
+  int64_t mirroring_display_id_;
   DisplayList software_mirroring_display_list_;
 
   // User preference for rotation lock of the internal display.
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index ffd017d..d23ac30 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -41,7 +41,7 @@ using base::StringPrintf;
 
 namespace {
 
-std::string ToDisplayName(int64 id) {
+std::string ToDisplayName(int64_t id) {
   return "x-" + base::Int64ToString(id);
 }
 
@@ -101,11 +101,11 @@ class DisplayManagerTest : public test::AshTestBase,
     return GetDisplayInfo(display_manager()->GetDisplayAt(index));
   }
 
-  const gfx::Display& GetDisplayForId(int64 id) {
+  const gfx::Display& GetDisplayForId(int64_t id) {
     return display_manager()->GetDisplayForId(id);
   }
 
-  const DisplayInfo& GetDisplayInfoForId(int64 id) {
+  const DisplayInfo& GetDisplayInfoForId(int64_t id) {
     return GetDisplayInfo(display_manager()->GetDisplayForId(id));
   }
 
@@ -411,7 +411,7 @@ TEST_F(DisplayManagerTest, OverscanInsetsTest) {
 
   // Make sure just moving the overscan area should property notify observers.
   UpdateDisplay("0+0-500x500");
-  int64 primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
   display_manager()->SetOverscanInsets(primary_id, gfx::Insets(0, 0, 20, 20));
   EXPECT_EQ("0,0 480x480",
             Shell::GetScreen()->GetPrimaryDisplay().bounds().ToString());
@@ -438,7 +438,7 @@ TEST_F(DisplayManagerTest, ZeroOverscanInsets) {
   // Make sure the display change events is emitted for overscan inset changes.
   UpdateDisplay("0+0-500x500,0+501-400x400");
   ASSERT_EQ(2u, display_manager()->GetNumDisplays());
-  int64 display2_id = display_manager()->GetDisplayAt(1).id();
+  int64_t display2_id = display_manager()->GetDisplayAt(1).id();
 
   reset();
   display_manager()->SetOverscanInsets(display2_id, gfx::Insets(0, 0, 0, 0));
@@ -473,18 +473,18 @@ TEST_F(DisplayManagerTest, TestDeviceScaleOnlyChange) {
             Shell::GetPrimaryRootWindow()->bounds().size().ToString());
 }
 
-DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
+DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
   DisplayInfo info(id, ToDisplayName(id), false);
   info.SetBounds(bounds);
   return info;
 }
 
 TEST_F(DisplayManagerTest, TestNativeDisplaysChanged) {
-  const int64 internal_display_id =
+  const int64_t internal_display_id =
       test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
   const int external_id = 10;
   const int mirror_id = 11;
-  const int64 invalid_id = gfx::Display::kInvalidDisplayID;
+  const int64_t invalid_id = gfx::Display::kInvalidDisplayID;
   const DisplayInfo internal_display_info =
       CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 500, 500));
   const DisplayInfo external_display_info =
@@ -651,14 +651,14 @@ TEST_F(DisplayManagerTest, DisplayAddRemoveAtTheSameTime) {
 
   UpdateDisplay("100+0-500x500,0+501-400x400");
 
-  const int64 primary_id = WindowTreeHostManager::GetPrimaryDisplayId();
-  const int64 secondary_id = ScreenUtil::GetSecondaryDisplay().id();
+  const int64_t primary_id = WindowTreeHostManager::GetPrimaryDisplayId();
+  const int64_t secondary_id = ScreenUtil::GetSecondaryDisplay().id();
 
   DisplayInfo primary_info = display_manager()->GetDisplayInfo(primary_id);
   DisplayInfo secondary_info = display_manager()->GetDisplayInfo(secondary_id);
 
   // An id which is different from primary and secondary.
-  const int64 third_id = secondary_id + 1;
+  const int64_t third_id = secondary_id + 1;
 
   DisplayInfo third_info =
       CreateDisplayInfo(third_id, gfx::Rect(0, 0, 600, 600));
@@ -708,7 +708,7 @@ TEST_F(DisplayManagerTest, NativeDisplaysChangedAfterPrimaryChange) {
   if (!SupportsMultipleDisplays())
     return;
 
-  const int64 internal_display_id =
+  const int64_t internal_display_id =
       test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
   const DisplayInfo native_display_info =
       CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 500, 500));
@@ -908,7 +908,7 @@ TEST_F(DisplayManagerTest, Rotate) {
   // Having the internal display deactivated should restore user rotation. Newly
   // set rotations should be applied.
   UpdateDisplay("200x200, 200x200");
-  const int64 internal_display_id =
+  const int64_t internal_display_id =
       test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
 
   display_manager()->SetDisplayRotation(internal_display_id,
@@ -944,7 +944,7 @@ TEST_F(DisplayManagerTest, UIScale) {
   test::ScopedDisable125DSFForUIScaling disable;
 
   UpdateDisplay("1280x800");
-  int64 display_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t display_id = Shell::GetScreen()->GetPrimaryDisplay().id();
   SetDisplayUIScale(display_id, 1.125f);
   EXPECT_EQ(1.0, GetDisplayInfoAt(0).configured_ui_scale());
   SetDisplayUIScale(display_id, 0.8f);
@@ -1094,7 +1094,7 @@ TEST_F(DisplayManagerTest, UIScaleWithDisplayMode) {
 }
 
 TEST_F(DisplayManagerTest, Use125DSFForUIScaling) {
-  int64 display_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t display_id = Shell::GetScreen()->GetPrimaryDisplay().id();
   test::ScopedSetInternalDisplayId set_internal(display_id);
 
   UpdateDisplay("1920x1080*1.25");
@@ -1128,7 +1128,7 @@ TEST_F(DisplayManagerTest, ResolutionChangeInUnifiedMode) {
 
   UpdateDisplay("200x200, 400x400");
 
-  int64 unified_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t unified_id = Shell::GetScreen()->GetPrimaryDisplay().id();
   DisplayInfo info = display_manager->GetDisplayInfo(unified_id);
   ASSERT_EQ(2u, info.display_modes().size());
   EXPECT_EQ("400x200", info.display_modes()[0].size.ToString());
@@ -1795,8 +1795,8 @@ TEST_F(DisplayManagerTest, UnifiedWithDockWindows) {
 TEST_F(DisplayManagerTest, DockMode) {
   if (!SupportsMultipleDisplays())
     return;
-  const int64 internal_id = 1;
-  const int64 external_id = 2;
+  const int64_t internal_id = 1;
+  const int64_t external_id = 2;
 
   const DisplayInfo internal_display_info =
       CreateDisplayInfo(internal_id, gfx::Rect(0, 0, 500, 500));
@@ -1808,7 +1808,7 @@ TEST_F(DisplayManagerTest, DockMode) {
   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);
 
diff --git a/ash/display/display_util.cc b/ash/display/display_util.cc
index 7c887be..ce0232b 100644
--- a/ash/display/display_util.cc
+++ b/ash/display/display_util.cc
@@ -202,7 +202,7 @@ bool GetDisplayModeForNextResolution(const DisplayInfo& info,
   return true;
 }
 
-bool SetDisplayUIScale(int64 id, float ui_scale) {
+bool SetDisplayUIScale(int64_t id, float ui_scale) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (!display_manager->IsActiveDisplayId(id) ||
       !gfx::Display::IsInternalDisplayId(id)) {
@@ -348,12 +348,12 @@ int FindDisplayIndexContainingPoint(const std::vector<gfx::Display>& displays,
   return iter == displays.end() ? -1 : (iter - displays.begin());
 }
 
-DisplayIdPair CreateDisplayIdPair(int64 id1, int64 id2) {
+DisplayIdPair CreateDisplayIdPair(int64_t id1, int64_t id2) {
   return CompareDisplayIds(id1, id2) ? std::make_pair(id1, id2)
                                      : std::make_pair(id2, id1);
 }
 
-bool CompareDisplayIds(int64 id1, int64 id2) {
+bool CompareDisplayIds(int64_t id1, int64_t id2) {
   DCHECK_NE(id1, id2);
   // Output index is stored in the first 8 bits. See GetDisplayIdFromEDID
   // in edid_parser.cc.
diff --git a/ash/display/display_util.h b/ash/display/display_util.h
index 0e4dadf..ccaa8df 100644
--- a/ash/display/display_util.h
+++ b/ash/display/display_util.h
@@ -5,6 +5,8 @@
 #ifndef ASH_DISPLAY_DISPLAY_UTIL_H_
 #define ASH_DISPLAY_DISPLAY_UTIL_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <utility>
 #include <vector>
@@ -55,7 +57,7 @@ ASH_EXPORT bool GetDisplayModeForNextResolution(const DisplayInfo& info,
 
 // Sets the UI scale for the |display_id|. Returns false if the
 // display_id is not an internal display.
-ASH_EXPORT bool SetDisplayUIScale(int64 display_id, float scale);
+ASH_EXPORT bool SetDisplayUIScale(int64_t display_id, float scale);
 
 // Tests if the |info| has display mode that matches |ui_scale|.
 bool HasDisplayModeForUIScale(const DisplayInfo& info, float ui_scale);
@@ -89,12 +91,12 @@ ASH_EXPORT int FindDisplayIndexContainingPoint(
 
 // Creates the DisplayIdPair where ids are sorted using |CompareDisplayIds|
 // below.
-ASH_EXPORT DisplayIdPair CreateDisplayIdPair(int64 id1, int64 id2);
+ASH_EXPORT DisplayIdPair CreateDisplayIdPair(int64_t id1, int64_t id2);
 
 // Returns true if one of following conditinos is met.
 // 1) id1 is internal.
 // 2) output index of id1 < output index of id2 and id2 isn't internal.
-ASH_EXPORT bool CompareDisplayIds(int64 id1, int64 id2);
+ASH_EXPORT bool CompareDisplayIds(int64_t id1, int64_t id2);
 
 }  // namespace ash
 
diff --git a/ash/display/event_transformation_handler.h b/ash/display/event_transformation_handler.h
index a59fa31..25ec4f8 100644
--- a/ash/display/event_transformation_handler.h
+++ b/ash/display/event_transformation_handler.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 
 namespace ash {
diff --git a/ash/display/extended_mouse_warp_controller.h b/ash/display/extended_mouse_warp_controller.h
index 52de762..162afa6 100644
--- a/ash/display/extended_mouse_warp_controller.h
+++ b/ash/display/extended_mouse_warp_controller.h
@@ -8,6 +8,7 @@
 #include "ash/display/mouse_warp_controller.h"
 
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 06ada9f..7daadce 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -327,7 +327,7 @@ gfx::Display MirrorWindowController::GetDisplayForRootWindow(
   for (const auto& pair : mirroring_host_info_map_) {
     if (pair.second->ash_host->AsWindowTreeHost()->window() == root) {
       // Sanity check to catch an error early.
-      int64 id = pair.first;
+      int64_t id = pair.first;
       const DisplayManager::DisplayList& list =
           Shell::GetInstance()
               ->display_manager()
@@ -344,7 +344,7 @@ gfx::Display MirrorWindowController::GetDisplayForRootWindow(
 }
 
 AshWindowTreeHost* MirrorWindowController::GetAshWindowTreeHostForDisplayId(
-    int64 id) {
+    int64_t id) {
   CHECK_EQ(1u, mirroring_host_info_map_.count(id));
   return mirroring_host_info_map_[id]->ash_host.get();
 }
diff --git a/ash/display/mirror_window_controller.h b/ash/display/mirror_window_controller.h
index d460885..727a733 100644
--- a/ash/display/mirror_window_controller.h
+++ b/ash/display/mirror_window_controller.h
@@ -5,12 +5,15 @@
 #ifndef ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_
 #define ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/display/display_manager.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
@@ -72,7 +75,7 @@ class ASH_EXPORT MirrorWindowController : public aura::WindowTreeHostObserver {
   gfx::Display GetDisplayForRootWindow(const aura::Window* root) const;
 
   // Returns the AshWindwoTreeHost created for |display_id|.
-  AshWindowTreeHost* GetAshWindowTreeHostForDisplayId(int64 display_id);
+  AshWindowTreeHost* GetAshWindowTreeHostForDisplayId(int64_t display_id);
 
   // Returns all root windows hosting mirroring displays.
   aura::Window::Windows GetAllRootWindows() const;
diff --git a/ash/display/mirror_window_controller_unittest.cc b/ash/display/mirror_window_controller_unittest.cc
index 5c2fb01..f118d24 100644
--- a/ash/display/mirror_window_controller_unittest.cc
+++ b/ash/display/mirror_window_controller_unittest.cc
@@ -26,7 +26,7 @@
 namespace ash {
 
 namespace {
-DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
+DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
   DisplayInfo info(id, base::StringPrintf("x-%d", static_cast<int>(id)), false);
   info.SetBounds(bounds);
   return info;
@@ -221,8 +221,8 @@ TEST_F(MirrorWindowControllerTest, MAYBE_MirrorCursorMoveOnEnter) {
       shell->window_tree_host_manager();
 
   UpdateDisplay("400x400*2/r,400x400");
-  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();
   test::ScopedSetInternalDisplayId set_internal(primary_display_id);
 
   // Chrome uses the internal display as the source display for software mirror
@@ -261,8 +261,8 @@ TEST_F(MirrorWindowControllerTest, MAYBE_MirrorCursorMoveOnEnter) {
 // from/to dock mode.
 TEST_F(MirrorWindowControllerTest, MAYBE_DockMode) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  const int64 internal_id = 1;
-  const int64 external_id = 2;
+  const int64_t internal_id = 1;
+  const int64_t external_id = 2;
 
   const DisplayInfo internal_display_info =
       CreateDisplayInfo(internal_id, gfx::Rect(0, 0, 500, 500));
@@ -276,7 +276,7 @@ TEST_F(MirrorWindowControllerTest, MAYBE_DockMode) {
   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);
 
diff --git a/ash/display/mouse_cursor_event_filter.h b/ash/display/mouse_cursor_event_filter.h
index a6652a5..85b097e 100644
--- a/ash/display/mouse_cursor_event_filter.h
+++ b/ash/display/mouse_cursor_event_filter.h
@@ -9,6 +9,7 @@
 #include "ash/display/window_tree_host_manager.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/ash/display/null_mouse_warp_controller.h b/ash/display/null_mouse_warp_controller.h
index 235bd62..64a7fda 100644
--- a/ash/display/null_mouse_warp_controller.h
+++ b/ash/display/null_mouse_warp_controller.h
@@ -7,6 +7,8 @@
 
 #include "ash/display/mouse_warp_controller.h"
 
+#include "base/macros.h"
+
 namespace ash {
 
 // A MouseWarpController when there is one desktop display
diff --git a/ash/display/projecting_observer_chromeos.h b/ash/display/projecting_observer_chromeos.h
index 0c6b4d1..2b61e40 100644
--- a/ash/display/projecting_observer_chromeos.h
+++ b/ash/display/projecting_observer_chromeos.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
+#include "base/macros.h"
 #include "ui/display/chromeos/display_configurator.h"
 
 namespace chromeos {
diff --git a/ash/display/resolution_notification_controller.cc b/ash/display/resolution_notification_controller.cc
index 9c14fb8..bd31c95 100644
--- a/ash/display/resolution_notification_controller.cc
+++ b/ash/display/resolution_notification_controller.cc
@@ -93,14 +93,14 @@ const char ResolutionNotificationController::kNotificationId[] =
     "chrome://settings/display/resolution";
 
 struct ResolutionNotificationController::ResolutionChangeInfo {
-  ResolutionChangeInfo(int64 display_id,
+  ResolutionChangeInfo(int64_t display_id,
                        const DisplayMode& old_resolution,
                        const DisplayMode& new_resolution,
                        const base::Closure& accept_callback);
   ~ResolutionChangeInfo();
 
   // The id of the display where the resolution change happens.
-  int64 display_id;
+  int64_t display_id;
 
   // The resolution before the change.
   DisplayMode old_resolution;
@@ -116,7 +116,7 @@ struct ResolutionNotificationController::ResolutionChangeInfo {
   base::Closure accept_callback;
 
   // The remaining timeout in seconds. 0 if the change does not time out.
-  uint8 timeout_count;
+  uint8_t timeout_count;
 
   // The timer to invoke OnTimerTick() every second. This cannot be
   // OneShotTimer since the message contains text "automatically closed in xx
@@ -128,7 +128,7 @@ struct ResolutionNotificationController::ResolutionChangeInfo {
 };
 
 ResolutionNotificationController::ResolutionChangeInfo::ResolutionChangeInfo(
-    int64 display_id,
+    int64_t display_id,
     const DisplayMode& old_resolution,
     const DisplayMode& new_resolution,
     const base::Closure& accept_callback)
@@ -159,7 +159,7 @@ ResolutionNotificationController::~ResolutionNotificationController() {
 }
 
 void ResolutionNotificationController::PrepareNotification(
-    int64 display_id,
+    int64_t display_id,
     const DisplayMode& old_resolution,
     const DisplayMode& new_resolution,
     const base::Closure& accept_callback) {
@@ -267,7 +267,7 @@ void ResolutionNotificationController::RevertResolutionChange() {
       kNotificationId, false /* by_user */);
   if (!change_info_)
     return;
-  int64 display_id = change_info_->display_id;
+  int64_t display_id = change_info_->display_id;
   DisplayMode old_resolution = change_info_->old_resolution;
   change_info_.reset();
   Shell::GetInstance()->display_manager()->SetDisplayMode(
diff --git a/ash/display/resolution_notification_controller.h b/ash/display/resolution_notification_controller.h
index 8a74ae8..0a4efef 100644
--- a/ash/display/resolution_notification_controller.h
+++ b/ash/display/resolution_notification_controller.h
@@ -5,10 +5,13 @@
 #ifndef ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_
 #define ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/geometry/size.h"
@@ -47,7 +50,7 @@ class ASH_EXPORT ResolutionNotificationController
   // asynchronously after the resolution change is requested. So typically this
   // method will be combined with resolution change methods like
   // DisplayManager::SetDisplayMode().
-  void PrepareNotification(int64 display_id,
+  void PrepareNotification(int64_t display_id,
                            const DisplayMode& old_resolution,
                            const DisplayMode& new_resolution,
                            const base::Closure& accept_callback);
diff --git a/ash/display/resolution_notification_controller_unittest.cc b/ash/display/resolution_notification_controller_unittest.cc
index 98a9172..a6a7f1e 100644
--- a/ash/display/resolution_notification_controller_unittest.cc
+++ b/ash/display/resolution_notification_controller_unittest.cc
@@ -20,7 +20,7 @@
 namespace ash {
 namespace {
 
-base::string16 ExpectedNotificationMessage(int64 display_id,
+base::string16 ExpectedNotificationMessage(int64_t display_id,
                                            const gfx::Size& new_resolution) {
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED,
@@ -31,7 +31,7 @@ base::string16 ExpectedNotificationMessage(int64 display_id,
 }
 
 base::string16 ExpectedFallbackNotificationMessage(
-    int64 display_id,
+    int64_t display_id,
     const gfx::Size& specified_resolution,
     const gfx::Size& fallback_resolution) {
   return l10n_util::GetStringFUTF16(
@@ -86,7 +86,7 @@ class ResolutionNotificationControllerTest : public ash::test::AshTestBase {
     // so invoke UpdateDisplay() to emit that event explicitly.
     std::vector<DisplayInfo> info_list;
     for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
-      int64 id = display_manager->GetDisplayAt(i).id();
+      int64_t id = display_manager->GetDisplayAt(i).id();
       DisplayInfo info = display_manager->GetDisplayInfo(id);
       if (display.id() == id) {
         gfx::Rect bounds = info.bounds_in_native();
@@ -166,7 +166,7 @@ TEST_F(ResolutionNotificationControllerTest, Basic) {
     return;
 
   UpdateDisplay("300x300#300x300%57|200x200%58,250x250#250x250%59|200x200%60");
-  int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
+  int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   ASSERT_EQ(0, accept_count());
@@ -199,7 +199,7 @@ TEST_F(ResolutionNotificationControllerTest, ClickMeansAccept) {
     return;
 
   UpdateDisplay("300x300#300x300%57|200x200%58,250x250#250x250%59|200x200%60");
-  int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
+  int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   ASSERT_EQ(0, accept_count());
@@ -269,7 +269,7 @@ TEST_F(ResolutionNotificationControllerTest, Close) {
     return;
 
   UpdateDisplay("100x100,150x150#150x150%59|200x200%60");
-  int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
+  int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   ASSERT_EQ(0, accept_count());
@@ -324,7 +324,7 @@ TEST_F(ResolutionNotificationControllerTest, DisplayDisconnected) {
 
   UpdateDisplay("300x300#300x300%56|200x200%57,"
                 "200x200#250x250%58|200x200%59|100x100%60");
-  int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
+  int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   SetDisplayResolutionAndNotify(
@@ -349,7 +349,7 @@ TEST_F(ResolutionNotificationControllerTest, MultipleResolutionChange) {
 
   UpdateDisplay("300x300#300x300%56|200x200%57,"
                 "250x250#250x250%58|200x200%59");
-  int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
+  int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
 
@@ -388,7 +388,7 @@ TEST_F(ResolutionNotificationControllerTest, Fallback) {
 
   UpdateDisplay("300x300#300x300%56|200x200%57,"
                 "250x250#250x250%58|220x220%59|200x200%60");
-  int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
+  int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   ASSERT_EQ(0, accept_count());
diff --git a/ash/display/root_window_transformers.cc b/ash/display/root_window_transformers.cc
index fae4eec..830cdba 100644
--- a/ash/display/root_window_transformers.cc
+++ b/ash/display/root_window_transformers.cc
@@ -12,7 +12,6 @@
 #include "ash/host/root_window_transformer.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc
index 63cb5ac..cf16d70 100644
--- a/ash/display/root_window_transformers_unittest.cc
+++ b/ash/display/root_window_transformers_unittest.cc
@@ -108,7 +108,7 @@ class TestEventHandler : public ui::EventHandler {
   DISALLOW_COPY_AND_ASSIGN(TestEventHandler);
 };
 
-float GetStoredUIScale(int64 id) {
+float GetStoredUIScale(int64_t id) {
   return Shell::GetInstance()->display_manager()->GetDisplayInfo(id).
       GetEffectiveUIScale();
 }
@@ -152,7 +152,7 @@ TEST_F(RootWindowTransformersTest, MAYBE_RotateAndMagnify) {
 
   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]);
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index 324ca7e..6008922 100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -164,7 +164,7 @@ gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
   if (!root_window)
     return GetPrimaryDisplay();
   const RootWindowSettings* rws = GetRootWindowSettings(root_window);
-  int64 id = rws->display_id;
+  int64_t id = rws->display_id;
   // if id is |kInvaildDisplayID|, it's being deleted.
   DCHECK(id != gfx::Display::kInvalidDisplayID);
   if (id == gfx::Display::kInvalidDisplayID)
diff --git a/ash/display/screen_ash.h b/ash/display/screen_ash.h
index 8139bf3f..991f72f 100644
--- a/ash/display/screen_ash.h
+++ b/ash/display/screen_ash.h
@@ -5,8 +5,11 @@
 #ifndef ASH_DISPLAY_SCREEN_ASH_H_
 #define ASH_DISPLAY_SCREEN_ASH_H_
 
+#include <stdint.h>
+
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/screen.h"
diff --git a/ash/display/screen_position_controller.h b/ash/display/screen_position_controller.h
index 57e3e76..c87d82d 100644
--- a/ash/display/screen_position_controller.h
+++ b/ash/display/screen_position_controller.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/aura/client/screen_position_client.h"
 
 namespace ash {
diff --git a/ash/display/shared_display_edge_indicator.h b/ash/display/shared_display_edge_indicator.h
index 5f8f6a0..d08fd59 100644
--- a/ash/display/shared_display_edge_indicator.h
+++ b/ash/display/shared_display_edge_indicator.h
@@ -6,7 +6,7 @@
 #define ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/display.h"
diff --git a/ash/display/unified_mouse_warp_controller.cc b/ash/display/unified_mouse_warp_controller.cc
index 086f97e..09bcf51 100644
--- a/ash/display/unified_mouse_warp_controller.cc
+++ b/ash/display/unified_mouse_warp_controller.cc
@@ -24,7 +24,8 @@ namespace ash {
 
 namespace {
 
-AshWindowTreeHost* GetMirroringAshWindowTreeHostForDisplayId(int64 display_id) {
+AshWindowTreeHost* GetMirroringAshWindowTreeHostForDisplayId(
+    int64_t display_id) {
   return Shell::GetInstance()
       ->window_tree_host_manager()
       ->mirror_window_controller()
diff --git a/ash/display/unified_mouse_warp_controller.h b/ash/display/unified_mouse_warp_controller.h
index 298ae9a..639d146 100644
--- a/ash/display/unified_mouse_warp_controller.h
+++ b/ash/display/unified_mouse_warp_controller.h
@@ -7,6 +7,9 @@
 
 #include "ash/display/mouse_warp_controller.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace aura {
@@ -52,7 +55,7 @@ class ASH_EXPORT UnifiedMouseWarpController : public MouseWarpController {
   gfx::Rect first_edge_bounds_in_native_;
   gfx::Rect second_edge_bounds_in_native_;
 
-  int64 current_cursor_display_id_;
+  int64_t current_cursor_display_id_;
 
   bool update_location_for_test_;
 
diff --git a/ash/display/unified_mouse_warp_controller_unittest.cc b/ash/display/unified_mouse_warp_controller_unittest.cc
index ca6e5c5..e91ca26 100644
--- a/ash/display/unified_mouse_warp_controller_unittest.cc
+++ b/ash/display/unified_mouse_warp_controller_unittest.cc
@@ -34,7 +34,7 @@ class UnifiedMouseWarpControllerTest : public test::AshTestBase {
  protected:
   bool FindMirrroingDisplayIdContainingNativePoint(
       const gfx::Point& point_in_native,
-      int64* display_id,
+      int64_t* display_id,
       gfx::Point* point_in_mirroring_host,
       gfx::Point* point_in_unified_host) {
     DisplayManager* display_manager = Shell::GetInstance()->display_manager();
@@ -68,7 +68,7 @@ class UnifiedMouseWarpControllerTest : public test::AshTestBase {
             ->mouse_warp_controller_for_test())
         ->update_location_for_test();
     DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-    int64 orig_mirroring_display_id;
+    int64_t orig_mirroring_display_id;
     gfx::Point point_in_unified_host;
     gfx::Point point_in_mirroring_host;
     if (!FindMirrroingDisplayIdContainingNativePoint(
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
index aabf1b2..bb0224e 100644
--- a/ash/display/window_tree_host_manager.cc
+++ b/ash/display/window_tree_host_manager.cc
@@ -75,7 +75,7 @@ namespace {
 // during the shutdown instead of always keeping two display instances
 // (one here and another one in display_manager) in sync, which is error prone.
 // This is initialized in the constructor, and then in CreatePrimaryHost().
-int64 primary_display_id = -1;
+int64_t primary_display_id = -1;
 
 // Specifies how long the display change should have been disabled
 // after each display change operations.
@@ -83,9 +83,9 @@ int64 primary_display_id = -1;
 // changing the settings while the system is still configurating
 // displays. It will be overriden by |kAfterDisplayChangeThrottleTimeoutMs|
 // when the display change happens, so the actual timeout is much shorter.
-const int64 kAfterDisplayChangeThrottleTimeoutMs = 500;
-const int64 kCycleDisplayThrottleTimeoutMs = 4000;
-const int64 kSwapDisplayThrottleTimeoutMs = 500;
+const int64_t kAfterDisplayChangeThrottleTimeoutMs = 500;
+const int64_t kCycleDisplayThrottleTimeoutMs = 4000;
+const int64_t kSwapDisplayThrottleTimeoutMs = 500;
 
 #if defined(USE_OZONE) && defined(OS_CHROMEOS)
 // Add 20% more cursor motion on non-integrated displays.
@@ -250,7 +250,7 @@ WindowTreeHostManager::DisplayChangeLimiter::DisplayChangeLimiter()
     : throttle_timeout_(base::Time::Now()) {}
 
 void WindowTreeHostManager::DisplayChangeLimiter::SetThrottleTimeout(
-    int64 throttle_ms) {
+    int64_t throttle_ms) {
   throttle_timeout_ =
       base::Time::Now() + base::TimeDelta::FromMilliseconds(throttle_ms);
 }
@@ -297,7 +297,7 @@ void WindowTreeHostManager::Shutdown() {
 
   Shell::GetScreen()->RemoveObserver(this);
 
-  int64 primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
 
   // Delete non primary root window controllers first, then
   // delete the primary root window controller.
@@ -353,7 +353,7 @@ void WindowTreeHostManager::RemoveObserver(Observer* observer) {
 }
 
 // static
-int64 WindowTreeHostManager::GetPrimaryDisplayId() {
+int64_t WindowTreeHostManager::GetPrimaryDisplayId() {
   CHECK_NE(gfx::Display::kInvalidDisplayID, primary_display_id);
   return primary_display_id;
 }
@@ -362,14 +362,14 @@ aura::Window* WindowTreeHostManager::GetPrimaryRootWindow() {
   return GetRootWindowForDisplayId(primary_display_id);
 }
 
-aura::Window* WindowTreeHostManager::GetRootWindowForDisplayId(int64 id) {
+aura::Window* WindowTreeHostManager::GetRootWindowForDisplayId(int64_t id) {
   AshWindowTreeHost* host = GetAshWindowTreeHostForDisplayId(id);
   CHECK(host);
   return GetWindow(host);
 }
 
 AshWindowTreeHost* WindowTreeHostManager::GetAshWindowTreeHostForDisplayId(
-    int64 display_id) {
+    int64_t display_id) {
   CHECK_EQ(1u, window_tree_hosts_.count(display_id)) << "display id = "
                                                      << display_id;
   return window_tree_hosts_[display_id];
@@ -402,12 +402,12 @@ aura::Window::Windows WindowTreeHostManager::GetAllRootWindows() {
   return windows;
 }
 
-gfx::Insets WindowTreeHostManager::GetOverscanInsets(int64 display_id) const {
+gfx::Insets WindowTreeHostManager::GetOverscanInsets(int64_t display_id) const {
   return GetDisplayManager()->GetOverscanInsets(display_id);
 }
 
 void WindowTreeHostManager::SetOverscanInsets(
-    int64 display_id,
+    int64_t display_id,
     const gfx::Insets& insets_in_dip) {
   GetDisplayManager()->SetOverscanInsets(display_id, insets_in_dip);
 }
@@ -469,7 +469,7 @@ void WindowTreeHostManager::SwapPrimaryDisplay() {
   }
 }
 
-void WindowTreeHostManager::SetPrimaryDisplayId(int64 id) {
+void WindowTreeHostManager::SetPrimaryDisplayId(int64_t id) {
   DCHECK_NE(gfx::Display::kInvalidDisplayID, id);
   if (id == gfx::Display::kInvalidDisplayID || primary_display_id == id)
     return;
@@ -547,7 +547,7 @@ void WindowTreeHostManager::UpdateMouseLocationAfterDisplayChange() {
 
   gfx::Point point_in_screen = Shell::GetScreen()->GetCursorScreenPoint();
   gfx::Point target_location_in_native;
-  int64 closest_distance_squared = -1;
+  int64_t closest_distance_squared = -1;
   DisplayManager* display_manager = GetDisplayManager();
 
   aura::Window* dst_root_window = nullptr;
@@ -569,7 +569,7 @@ void WindowTreeHostManager::UpdateMouseLocationAfterDisplayChange() {
     // We don't care about actual distance, only relative to other displays, so
     // using the LengthSquared() is cheaper than Length().
 
-    int64 distance_squared = (center - point_in_screen).LengthSquared();
+    int64_t distance_squared = (center - point_in_screen).LengthSquared();
     if (closest_distance_squared < 0 ||
         closest_distance_squared > distance_squared) {
       aura::Window* root_window = GetRootWindowForDisplayId(display.id());
@@ -594,7 +594,7 @@ void WindowTreeHostManager::UpdateMouseLocationAfterDisplayChange() {
   // the cursor.
   if (!target_display.is_valid())
     return;
-  int64 target_display_id = target_display.id();
+  int64_t target_display_id = target_display.id();
 
   // Do not move the cursor if the cursor's location did not change. This avoids
   // moving (and showing) the cursor:
@@ -630,7 +630,7 @@ bool WindowTreeHostManager::UpdateWorkAreaOfDisplayNearestWindow(
     const aura::Window* window,
     const gfx::Insets& insets) {
   const aura::Window* root_window = window->GetRootWindow();
-  int64 id = GetRootWindowSettings(root_window)->display_id;
+  int64_t id = GetRootWindowSettings(root_window)->display_id;
   // if id is |kInvaildDisplayID|, it's being deleted.
   DCHECK(id != gfx::Display::kInvalidDisplayID);
   return GetDisplayManager()->UpdateWorkAreaOfDisplay(id, insets);
@@ -678,7 +678,7 @@ void WindowTreeHostManager::OnDisplayAdded(const gfx::Display& display) {
 #ifndef NDEBUG
     auto iter = std::find_if(
         window_tree_hosts_.begin(), window_tree_hosts_.end(),
-        [to_delete](const std::pair<int64, AshWindowTreeHost*>& pair) {
+        [to_delete](const std::pair<int64_t, AshWindowTreeHost*>& pair) {
           return pair.second == to_delete;
         });
     DCHECK(iter == window_tree_hosts_.end());
@@ -848,7 +848,7 @@ void WindowTreeHostManager::PostDisplayConfigurationChange() {
         pair, display_manager->IsInMirrorMode(), layout.default_unified);
 
     if (Shell::GetScreen()->GetNumDisplays() > 1) {
-      int64 primary_id = layout.primary_id;
+      int64_t primary_id = layout.primary_id;
       SetPrimaryDisplayId(primary_id == gfx::Display::kInvalidDisplayID
                               ? pair.first
                               : primary_id);
diff --git a/ash/display/window_tree_host_manager.h b/ash/display/window_tree_host_manager.h
index 67ae28d..b72cefe 100644
--- a/ash/display/window_tree_host_manager.h
+++ b/ash/display/window_tree_host_manager.h
@@ -5,14 +5,16 @@
 #ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/display/display_manager.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
@@ -89,7 +91,7 @@ class ASH_EXPORT WindowTreeHostManager
 
   // Returns primary display's ID.
   // TODO(oshima): Move this out from WindowTreeHostManager;
-  static int64 GetPrimaryDisplayId();
+  static int64_t GetPrimaryDisplayId();
 
   CursorWindowController* cursor_window_controller() {
     return cursor_window_controller_.get();
@@ -114,11 +116,11 @@ class ASH_EXPORT WindowTreeHostManager
   aura::Window* GetPrimaryRootWindow();
 
   // Returns the root window for |display_id|.
-  aura::Window* GetRootWindowForDisplayId(int64 id);
+  aura::Window* GetRootWindowForDisplayId(int64_t id);
 
   // Returns AshWTH for given display |id|. Call results in CHECK failure
   // if the WTH does not exist.
-  AshWindowTreeHost* GetAshWindowTreeHostForDisplayId(int64 id);
+  AshWindowTreeHost* GetAshWindowTreeHostForDisplayId(int64_t id);
 
   // Toggle mirror mode.
   void ToggleMirrorMode();
@@ -128,7 +130,7 @@ class ASH_EXPORT WindowTreeHostManager
 
   // Sets the ID of the primary display.  If the display is not connected, it
   // will switch the primary display when connected.
-  void SetPrimaryDisplayId(int64 id);
+  void SetPrimaryDisplayId(int64_t id);
 
   // Sets primary display. This re-assigns the current root
   // window to given |display|.
@@ -147,8 +149,8 @@ class ASH_EXPORT WindowTreeHostManager
 
   // Gets/Sets/Clears the overscan insets for the specified |display_id|. See
   // display_manager.h for the details.
-  gfx::Insets GetOverscanInsets(int64 display_id) const;
-  void SetOverscanInsets(int64 display_id, const gfx::Insets& insets_in_dip);
+  gfx::Insets GetOverscanInsets(int64_t display_id) const;
+  void SetOverscanInsets(int64_t display_id, const gfx::Insets& insets_in_dip);
 
   // Checks if the mouse pointer is on one of displays, and moves to
   // the center of the nearest display if it's outside of all displays.
@@ -209,7 +211,7 @@ class ASH_EXPORT WindowTreeHostManager
     DisplayChangeLimiter();
 
     // Sets how long the throttling should last.
-    void SetThrottleTimeout(int64 throttle_ms);
+    void SetThrottleTimeout(int64_t throttle_ms);
 
     bool IsThrottled() const;
 
@@ -224,7 +226,7 @@ class ASH_EXPORT WindowTreeHostManager
   // change the display configuration.
   scoped_ptr<DisplayChangeLimiter> limiter_;
 
-  typedef std::map<int64, AshWindowTreeHost*> WindowTreeHostMap;
+  typedef std::map<int64_t, AshWindowTreeHost*> WindowTreeHostMap;
   // The mapping from display ID to its window tree host.
   WindowTreeHostMap window_tree_hosts_;
 
@@ -251,7 +253,7 @@ class ASH_EXPORT WindowTreeHostManager
 
   // Stores the cursor's display. The id is used to determine whether the mouse
   // should be moved after a display configuration change.
-  int64 cursor_display_id_for_restore_;
+  int64_t cursor_display_id_for_restore_;
 
   base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_;
 
diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc
index 5ea2343..bd80c05 100644
--- a/ash/display/window_tree_host_manager_unittest.cc
+++ b/ash/display/window_tree_host_manager_unittest.cc
@@ -129,24 +129,24 @@ class TestObserver : public WindowTreeHostManager::Observer,
     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() {
@@ -165,7 +165,7 @@ class TestObserver : public WindowTreeHostManager::Observer,
   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_;
@@ -349,7 +349,7 @@ class TestEventHandler : public ui::EventHandler {
   DISALLOW_COPY_AND_ASSIGN(TestEventHandler);
 };
 
-float GetStoredUIScale(int64 id) {
+float GetStoredUIScale(int64_t id) {
   return Shell::GetInstance()
       ->display_manager()
       ->GetDisplayInfo(id)
@@ -401,7 +401,7 @@ TEST_F(WindowTreeHostManagerTest, SecondaryDisplayLayout) {
   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);
 
@@ -530,7 +530,7 @@ TEST_F(WindowTreeHostManagerTest, SecondaryDisplayLayout) {
 
 namespace {
 
-DisplayInfo CreateDisplayInfo(int64 id,
+DisplayInfo CreateDisplayInfo(int64_t id,
                               int y,
                               gfx::Display::Rotation rotation) {
   DisplayInfo info(id, "", false);
@@ -539,7 +539,7 @@ DisplayInfo CreateDisplayInfo(int64 id,
   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;
@@ -566,7 +566,7 @@ TEST_F(WindowTreeHostManagerTest, MirrorToDockedWithFullscreen) {
   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());
@@ -659,7 +659,7 @@ TEST_F(WindowTreeHostManagerTest, BoundsUpdated) {
 
   // 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());
@@ -674,7 +674,7 @@ TEST_F(WindowTreeHostManagerTest, BoundsUpdated) {
   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
@@ -1021,7 +1021,7 @@ TEST_F(WindowTreeHostManagerTest, Rotate) {
 
   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]);
 
@@ -1222,7 +1222,7 @@ TEST_F(WindowTreeHostManagerTest, DockToSingle) {
 
   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);
@@ -1234,7 +1234,7 @@ TEST_F(WindowTreeHostManagerTest, DockToSingle) {
   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());
@@ -1343,7 +1343,7 @@ TEST_F(WindowTreeHostManagerTest, ReplacePrimary) {
   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);
 
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
index 35b1d9a..1dc0f34 100644
--- a/ash/drag_drop/drag_drop_controller.h
+++ b/ash/drag_drop/drag_drop_controller.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
diff --git a/ash/drag_drop/drag_drop_tracker.h b/ash/drag_drop/drag_drop_tracker.h
index 670422b..3a42342 100644
--- a/ash/drag_drop/drag_drop_tracker.h
+++ b/ash/drag_drop/drag_drop_tracker.h
@@ -6,7 +6,7 @@
 #define ASH_DRAG_DROP_DRAG_DROP_TRACKER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event.h"
 
diff --git a/ash/drag_drop/drag_image_view.h b/ash/drag_drop/drag_image_view.h
index 15d2ad5..ee504f9 100644
--- a/ash/drag_drop/drag_image_view.h
+++ b/ash/drag_drop/drag_image_view.h
@@ -5,6 +5,7 @@
 #ifndef ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
 #define ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
 
+#include "base/macros.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/views/controls/image_view.h"
 
diff --git a/ash/first_run/desktop_cleaner.h b/ash/first_run/desktop_cleaner.h
index 061f112..63d0f38 100644
--- a/ash/first_run/desktop_cleaner.h
+++ b/ash/first_run/desktop_cleaner.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 
diff --git a/ash/first_run/first_run_helper.h b/ash/first_run/first_run_helper.h
index a2b1508..80635d9 100644
--- a/ash/first_run/first_run_helper.h
+++ b/ash/first_run/first_run_helper.h
@@ -6,7 +6,7 @@
 #define ASH_FIRST_RUN_FIRST_RUN_HELPER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 
 namespace gfx {
diff --git a/ash/first_run/first_run_helper_impl.h b/ash/first_run/first_run_helper_impl.h
index 5e091f9..7bfb327 100644
--- a/ash/first_run/first_run_helper_impl.h
+++ b/ash/first_run/first_run_helper_impl.h
@@ -9,6 +9,7 @@
 #include "ash/first_run/desktop_cleaner.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/focus_cycler.h b/ash/focus_cycler.h
index 014b08a..9639d85 100644
--- a/ash/focus_cycler.h
+++ b/ash/focus_cycler.h
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace views {
 class Widget;
diff --git a/ash/frame/caption_buttons/frame_caption_button.h b/ash/frame/caption_buttons/frame_caption_button.h
index a54461d..144f1e9 100644
--- a/ash/frame/caption_buttons/frame_caption_button.h
+++ b/ash/frame/caption_buttons/frame_caption_button.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/frame/caption_buttons/caption_button_types.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/custom_button.h"
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.h b/ash/frame/caption_buttons/frame_caption_button_container_view.h
index e5620f5..352f968 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h
@@ -9,6 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/frame/caption_buttons/frame_size_button_delegate.h"
+#include "base/macros.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
diff --git a/ash/frame/caption_buttons/frame_size_button.h b/ash/frame/caption_buttons/frame_size_button.h
index 633ac49..84cf848 100644
--- a/ash/frame/caption_buttons/frame_size_button.h
+++ b/ash/frame/caption_buttons/frame_size_button.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/frame/caption_buttons/frame_caption_button.h"
 #include "ash/frame/caption_buttons/frame_size_button_delegate.h"
+#include "base/macros.h"
 #include "base/timer/timer.h"
 
 namespace views {
diff --git a/ash/frame/custom_frame_view_ash.h b/ash/frame/custom_frame_view_ash.h
index de63451c..892086f 100644
--- a/ash/frame/custom_frame_view_ash.h
+++ b/ash/frame/custom_frame_view_ash.h
@@ -6,6 +6,7 @@
 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/window/non_client_view.h"
diff --git a/ash/frame/default_header_painter.h b/ash/frame/default_header_painter.h
index a79f3d5..d867f6f1 100644
--- a/ash/frame/default_header_painter.h
+++ b/ash/frame/default_header_painter.h
@@ -7,9 +7,9 @@
 
 #include "ash/ash_export.h"
 #include "ash/frame/header_painter.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"  // override
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/animation/animation_delegate.h"
diff --git a/ash/frame/frame_border_hit_test_controller.h b/ash/frame/frame_border_hit_test_controller.h
index 9d50b0f..e46ff5b 100644
--- a/ash/frame/frame_border_hit_test_controller.h
+++ b/ash/frame/frame_border_hit_test_controller.h
@@ -6,8 +6,8 @@
 #define ASH_FRAME_FRAME_BORDER_HITTEST_CONTROLLER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/gpu_support_stub.h b/ash/gpu_support_stub.h
index d82c314..ff581ea 100644
--- a/ash/gpu_support_stub.h
+++ b/ash/gpu_support_stub.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/gpu_support.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/high_contrast/high_contrast_controller.h b/ash/high_contrast/high_contrast_controller.h
index 313aa05..ddf1e73 100644
--- a/ash/high_contrast/high_contrast_controller.h
+++ b/ash/high_contrast/high_contrast_controller.h
@@ -7,7 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/host/ash_remote_window_tree_host_win.h b/ash/host/ash_remote_window_tree_host_win.h
index 77ff3c3..f60e582 100644
--- a/ash/host/ash_remote_window_tree_host_win.h
+++ b/ash/host/ash_remote_window_tree_host_win.h
@@ -10,6 +10,7 @@
 #include "ash/ash_export.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/transformer_helper.h"
+#include "base/macros.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 
 namespace ash {
diff --git a/ash/host/ash_window_tree_host_unified.h b/ash/host/ash_window_tree_host_unified.h
index 32557c9..eda295eb 100644
--- a/ash/host/ash_window_tree_host_unified.h
+++ b/ash/host/ash_window_tree_host_unified.h
@@ -9,6 +9,7 @@
 
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/transformer_helper.h"
+#include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event_source.h"
diff --git a/ash/host/ash_window_tree_host_x11.cc b/ash/host/ash_window_tree_host_x11.cc
index a6971b5..24332af 100644
--- a/ash/host/ash_window_tree_host_x11.cc
+++ b/ash/host/ash_window_tree_host_x11.cc
@@ -16,7 +16,6 @@
 #include "ash/host/ash_window_tree_host_unified.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/ime/input_method_event_handler.h"
-#include "base/basictypes.h"
 #include "base/sys_info.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
@@ -207,7 +206,7 @@ bool AshWindowTreeHostX11::CanDispatchEvent(const ui::PlatformEvent& event) {
     case ui::ET_TOUCH_RELEASED: {
 #if defined(OS_CHROMEOS)
       XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
-      int64 touch_display_id =
+      int64_t touch_display_id =
           ui::DeviceDataManager::GetInstance()->GetTargetDisplayForTouchDevice(
               xiev->deviceid);
       // If we don't have record of display id for this touch device, check
diff --git a/ash/host/ash_window_tree_host_x11.h b/ash/host/ash_window_tree_host_x11.h
index f0e30d3..0c36d03 100644
--- a/ash/host/ash_window_tree_host_x11.h
+++ b/ash/host/ash_window_tree_host_x11.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/transformer_helper.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/window_tree_host_x11.h"
diff --git a/ash/host/transformer_helper.h b/ash/host/transformer_helper.h
index 0e24ad1..fdf315c 100644
--- a/ash/host/transformer_helper.h
+++ b/ash/host/transformer_helper.h
@@ -5,6 +5,7 @@
 #ifndef ASH_HOST_TRANSFORMER_HELPER_H_
 #define ASH_HOST_TRANSFORMER_HELPER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace gfx {
diff --git a/ash/ime/input_method_event_handler.h b/ash/ime/input_method_event_handler.h
index 241bf09..32332a0 100644
--- a/ash/ime/input_method_event_handler.h
+++ b/ash/ime/input_method_event_handler.h
@@ -6,6 +6,7 @@
 #define ASH_IME_INPUT_METHOD_EVENT_HANDLER_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 
 namespace ui {
diff --git a/ash/keyboard_uma_event_filter.h b/ash/keyboard_uma_event_filter.h
index 494ff66..a52cf35 100644
--- a/ash/keyboard_uma_event_filter.h
+++ b/ash/keyboard_uma_event_filter.h
@@ -6,6 +6,7 @@
 #define ASH_KEYBOARD_UMA_EVENT_FILTER_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/magnifier/magnification_controller.h b/ash/magnifier/magnification_controller.h
index ea132d6..361b814 100644
--- a/ash/magnifier/magnification_controller.h
+++ b/ash/magnifier/magnification_controller.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/ash/magnifier/partial_magnification_controller.h b/ash/magnifier/partial_magnification_controller.h
index fc61e41..39c8d91 100644
--- a/ash/magnifier/partial_magnification_controller.h
+++ b/ash/magnifier/partial_magnification_controller.h
@@ -5,6 +5,7 @@
 #ifndef ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_
 #define ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_
 
+#include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/geometry/point.h"
diff --git a/ash/metrics/task_switch_metrics_recorder.h b/ash/metrics/task_switch_metrics_recorder.h
index 6dc718e..686c5a3 100644
--- a/ash/metrics/task_switch_metrics_recorder.h
+++ b/ash/metrics/task_switch_metrics_recorder.h
@@ -9,6 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/metrics/task_switch_time_tracker.h b/ash/metrics/task_switch_time_tracker.h
index 77d1182..94ac653 100644
--- a/ash/metrics/task_switch_time_tracker.h
+++ b/ash/metrics/task_switch_time_tracker.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
diff --git a/ash/metrics/user_metrics_recorder.h b/ash/metrics/user_metrics_recorder.h
index adce6dd..46dfd0d 100644
--- a/ash/metrics/user_metrics_recorder.h
+++ b/ash/metrics/user_metrics_recorder.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/metrics/task_switch_metrics_recorder.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 
diff --git a/ash/multi_profile_uma.h b/ash/multi_profile_uma.h
index 21387b2..69c68b74 100644
--- a/ash/multi_profile_uma.h
+++ b/ash/multi_profile_uma.h
@@ -6,7 +6,7 @@
 #define ASH_MULTI_PROFILE_UMA_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/popup_message.h b/ash/popup_message.h
index c2b160f..1fa9b61 100644
--- a/ash/popup_message.h
+++ b/ash/popup_message.h
@@ -6,8 +6,8 @@
 #define ASH_POPUP_MESSAGE_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/bubble/bubble_border.h"
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 1138a0d..139b11e 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -11,7 +11,7 @@
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell_observer.h"
 #include "ash/system/user/login_status.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
diff --git a/ash/root_window_settings.h b/ash/root_window_settings.h
index dc67647..84abc3f 100644
--- a/ash/root_window_settings.h
+++ b/ash/root_window_settings.h
@@ -5,8 +5,9 @@
 #ifndef ASH_ROOT_WINDOW_SETTINGS_H_
 #define ASH_ROOT_WINDOW_SETTINGS_H_
 
+#include <stdint.h>
+
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 
 namespace aura {
 class Window;
@@ -23,7 +24,7 @@ struct RootWindowSettings {
   RootWindowSettings();
 
   // ID of the display associated with the root window.
-  int64 display_id;
+  int64_t display_id;
 
   // RootWindowController for the root window. This may be NULL
   // for the root window used for mirroring.
diff --git a/ash/rotator/screen_rotation_animation.h b/ash/rotator/screen_rotation_animation.h
index 70f6872..e93f6f6 100644
--- a/ash/rotator/screen_rotation_animation.h
+++ b/ash/rotator/screen_rotation_animation.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/compositor/layer_animation_element.h"
diff --git a/ash/rotator/screen_rotation_animator.cc b/ash/rotator/screen_rotation_animator.cc
index fc7c651..8996855 100644
--- a/ash/rotator/screen_rotation_animator.cc
+++ b/ash/rotator/screen_rotation_animator.cc
@@ -42,7 +42,7 @@ const int kRotationDurationInMs = 250;
 
 // Gets the current display rotation for the display with the specified
 // |display_id|.
-gfx::Display::Rotation GetCurrentRotation(int64 display_id) {
+gfx::Display::Rotation GetCurrentRotation(int64_t display_id) {
   return Shell::GetInstance()
       ->display_manager()
       ->GetDisplayInfo(display_id)
@@ -145,7 +145,7 @@ void LayerCleanupObserver::AbortAnimations(ui::Layer* layer) {
 // layer towards the new orientation through |rotation_degrees| while fading
 // out, and the new orientation's layer will be rotated in to the
 // |new_orientation| through |rotation_degrees| arc.
-void RotateScreen(int64 display_id,
+void RotateScreen(int64_t display_id,
                   gfx::Display::Rotation new_rotation,
                   gfx::Display::RotationSource source) {
   aura::Window* root_window = Shell::GetInstance()
@@ -243,9 +243,8 @@ void RotateScreen(int64 display_id,
 
 }  // namespace
 
-ScreenRotationAnimator::ScreenRotationAnimator(int64 display_id)
-    : display_id_(display_id) {
-}
+ScreenRotationAnimator::ScreenRotationAnimator(int64_t display_id)
+    : display_id_(display_id) {}
 
 ScreenRotationAnimator::~ScreenRotationAnimator() {
 }
diff --git a/ash/rotator/screen_rotation_animator.h b/ash/rotator/screen_rotation_animator.h
index d57a85e..179d0be 100644
--- a/ash/rotator/screen_rotation_animator.h
+++ b/ash/rotator/screen_rotation_animator.h
@@ -5,8 +5,10 @@
 #ifndef ASH_ROTATOR_SCREEN_ROTATION_ANIMATOR_H_
 #define ASH_ROTATOR_SCREEN_ROTATION_ANIMATOR_H_
 
+#include <stdint.h>
+
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
@@ -14,7 +16,7 @@ namespace ash {
 // Utility to perform a screen rotation with an animation.
 class ASH_EXPORT ScreenRotationAnimator {
  public:
-  explicit ScreenRotationAnimator(int64 display_id);
+  explicit ScreenRotationAnimator(int64_t display_id);
   ~ScreenRotationAnimator();
 
   // Returns true if the screen rotation animation can be completed
@@ -31,7 +33,7 @@ class ASH_EXPORT ScreenRotationAnimator {
 
  private:
   // The id of the display to rotate.
-  int64 display_id_;
+  int64_t display_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenRotationAnimator);
 };
diff --git a/ash/rotator/window_rotation.h b/ash/rotator/window_rotation.h
index d6f9f70..ef9691b 100644
--- a/ash/rotator/window_rotation.h
+++ b/ash/rotator/window_rotation.h
@@ -6,7 +6,7 @@
 #define ASH_WINDOW_ROTATION_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/gfx/geometry/point.h"
diff --git a/ash/scoped_target_root_window.h b/ash/scoped_target_root_window.h
index 0a74957..b732e40 100644
--- a/ash/scoped_target_root_window.h
+++ b/ash/scoped_target_root_window.h
@@ -1,11 +1,12 @@
 // Copyright 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.
+
 #ifndef ASH_SCOPED_TARGET_ROOT_WINDOW_H_
 #define ASH_SCOPED_TARGET_ROOT_WINDOW_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/screen_util.h b/ash/screen_util.h
index 79c0358..2cf1c1e 100644
--- a/ash/screen_util.h
+++ b/ash/screen_util.h
@@ -6,7 +6,7 @@
 #define ASH_SCREEN_UTIL_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/session/session_state_observer.h b/ash/session/session_state_observer.h
index dcb3b37..a31834b 100644
--- a/ash/session/session_state_observer.h
+++ b/ash/session/session_state_observer.h
@@ -9,7 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/session/session_state_delegate.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 class AccountId;
 
diff --git a/ash/shelf/app_list_button.h b/ash/shelf/app_list_button.h
index b5ad007..e0e5cd8 100644
--- a/ash/shelf/app_list_button.h
+++ b/ash/shelf/app_list_button.h
@@ -5,6 +5,7 @@
 #ifndef ASH_SHELF_APP_LIST_BUTTON_H_
 #define ASH_SHELF_APP_LIST_BUTTON_H_
 
+#include "base/macros.h"
 #include "ui/views/controls/button/image_button.h"
 
 namespace ash {
diff --git a/ash/shelf/app_list_shelf_item_delegate.h b/ash/shelf/app_list_shelf_item_delegate.h
index 167bd10..38f46f5 100644
--- a/ash/shelf/app_list_shelf_item_delegate.h
+++ b/ash/shelf/app_list_shelf_item_delegate.h
@@ -6,8 +6,8 @@
 #define ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
 
 #include "ash/shelf/shelf_item_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/shelf/background_animator.cc b/ash/shelf/background_animator.cc
index 288791a..cac6d76 100644
--- a/ash/shelf/background_animator.cc
+++ b/ash/shelf/background_animator.cc
@@ -4,7 +4,6 @@
 
 #include "ash/shelf/background_animator.h"
 
-
 namespace ash {
 namespace {
 
diff --git a/ash/shelf/background_animator.h b/ash/shelf/background_animator.h
index 4c01ac1..f97381a 100644
--- a/ash/shelf/background_animator.h
+++ b/ash/shelf/background_animator.h
@@ -6,7 +6,7 @@
 #define ASH_SHELF_BACKGROUND_ANIMATOR_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/slide_animation.h"
 
diff --git a/ash/shelf/overflow_bubble.h b/ash/shelf/overflow_bubble.h
index ad682e4..fc97101 100644
--- a/ash/shelf/overflow_bubble.h
+++ b/ash/shelf/overflow_bubble.h
@@ -5,8 +5,8 @@
 #ifndef ASH_SHELF_OVERFLOW_BUBBLE_H_
 #define ASH_SHELF_OVERFLOW_BUBBLE_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 #include "ui/views/widget/widget_observer.h"
 
diff --git a/ash/shelf/overflow_bubble_view.h b/ash/shelf/overflow_bubble_view.h
index 82fd765..8859fe2 100644
--- a/ash/shelf/overflow_bubble_view.h
+++ b/ash/shelf/overflow_bubble_view.h
@@ -6,8 +6,8 @@
 #define ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/bubble/bubble_delegate.h"
 
 namespace ash {
diff --git a/ash/shelf/overflow_button.h b/ash/shelf/overflow_button.h
index 2b75cea..04f01fa 100644
--- a/ash/shelf/overflow_button.h
+++ b/ash/shelf/overflow_button.h
@@ -6,8 +6,8 @@
 #define ASH_SHELF_OVERFLOW_BUTTON_H_
 
 #include "ash/shelf/shelf_types.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/custom_button.h"
 
diff --git a/ash/shelf/scoped_observer_with_duplicated_sources.h b/ash/shelf/scoped_observer_with_duplicated_sources.h
index c326712..f3ece1e 100644
--- a/ash/shelf/scoped_observer_with_duplicated_sources.h
+++ b/ash/shelf/scoped_observer_with_duplicated_sources.h
@@ -7,8 +7,8 @@
 
 #include <map>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 
 // ScopedObserverWithDuplicatedSources is used to keep track of the set of
 // sources an object has attached itself to as an observer. When
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index 8af315b..ebd2a6a 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -8,7 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_types.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_observer.h"
diff --git a/ash/shelf/shelf_alignment_menu.h b/ash/shelf/shelf_alignment_menu.h
index 5196292..add20f0 100644
--- a/ash/shelf/shelf_alignment_menu.h
+++ b/ash/shelf/shelf_alignment_menu.h
@@ -6,7 +6,7 @@
 #define ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace aura {
diff --git a/ash/shelf/shelf_bezel_event_filter.h b/ash/shelf/shelf_bezel_event_filter.h
index d4c3353..5493b83 100644
--- a/ash/shelf/shelf_bezel_event_filter.h
+++ b/ash/shelf/shelf_bezel_event_filter.h
@@ -6,6 +6,7 @@
 #define ASH_SHELF_SHELF_BEZEL_EVENT_FILTER_H_
 
 #include "ash/wm/gestures/shelf_gesture_handler.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/ash/shelf/shelf_button.h b/ash/shelf/shelf_button.h
index 2cd7da8..20dea7d 100644
--- a/ash/shelf/shelf_button.h
+++ b/ash/shelf/shelf_button.h
@@ -6,6 +6,7 @@
 #define ASH_SHELF_SHELF_BUTTON_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
diff --git a/ash/shelf/shelf_item_delegate_manager.h b/ash/shelf/shelf_item_delegate_manager.h
index b19b3a5..b406677 100644
--- a/ash/shelf/shelf_item_delegate_manager.h
+++ b/ash/shelf/shelf_item_delegate_manager.h
@@ -11,6 +11,7 @@
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_model_observer.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 478850c..73b701a 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -18,10 +18,10 @@
 #include "ash/wm/dock/docked_window_layout_manager_observer.h"
 #include "ash/wm/lock_state_observer.h"
 #include "ash/wm/workspace/workspace_types.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/geometry/insets.h"
diff --git a/ash/shelf/shelf_menu_model.h b/ash/shelf/shelf_menu_model.h
index 18e1dd0..020b30b4 100644
--- a/ash/shelf/shelf_menu_model.h
+++ b/ash/shelf/shelf_menu_model.h
@@ -6,6 +6,7 @@
 #define ASH_SHELF_SHELF_MENU_MODEL_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace ash {
diff --git a/ash/shelf/shelf_model.h b/ash/shelf/shelf_model.h
index 8c683c6..01ab2a92 100644
--- a/ash/shelf/shelf_model.h
+++ b/ash/shelf/shelf_model.h
@@ -7,7 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_item_types.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 
 namespace ash {
diff --git a/ash/shelf/shelf_tooltip_manager.h b/ash/shelf/shelf_tooltip_manager.h
index 8850f49..17eaee4 100644
--- a/ash/shelf/shelf_tooltip_manager.h
+++ b/ash/shelf/shelf_tooltip_manager.h
@@ -8,7 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_types.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "ui/events/event_handler.h"
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index 82ea7fa..c9c32b1 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -14,6 +14,7 @@
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_model_observer.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
 #include "ui/views/animation/bounds_animator_observer.h"
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index a9029fc..203048e 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -30,7 +30,6 @@
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_shelf_delegate.h"
 #include "ash/test/test_shelf_item_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/ash/shelf/shelf_window_watcher.h b/ash/shelf/shelf_window_watcher.h
index c9ffcbf..fce59e1 100644
--- a/ash/shelf/shelf_window_watcher.h
+++ b/ash/shelf/shelf_window_watcher.h
@@ -5,9 +5,11 @@
 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 
+#include <stdint.h>
+
 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/shelf/shelf_window_watcher_item_delegate.h b/ash/shelf/shelf_window_watcher_item_delegate.h
index 87be6a8..7d751d6 100644
--- a/ash/shelf/shelf_window_watcher_item_delegate.h
+++ b/ash/shelf/shelf_window_watcher_item_delegate.h
@@ -6,8 +6,8 @@
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
 
 #include "ash/shelf/shelf_item_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/shell.h b/ash/shell.h
index 2e143ba..24f6176 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -14,9 +14,9 @@
 #include "ash/system/user/login_status.h"
 #include "ash/wm/cursor_manager_chromeos.h"
 #include "ash/wm/system_modal_container_event_filter_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index 3f4b9aa..b4581d8 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -10,7 +10,6 @@
 #include "ash/shell/example_factory.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_delegate.h"
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
diff --git a/ash/shell/content/client/shell_browser_main_parts.h b/ash/shell/content/client/shell_browser_main_parts.h
index 8b0c374..6112b21 100644
--- a/ash/shell/content/client/shell_browser_main_parts.h
+++ b/ash/shell/content/client/shell_browser_main_parts.h
@@ -5,7 +5,7 @@
 #ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_main_parts.h"
 
diff --git a/ash/shell/content/client/shell_content_browser_client.h b/ash/shell/content/client/shell_content_browser_client.h
index 1a5eb44..bef621a 100644
--- a/ash/shell/content/client/shell_content_browser_client.h
+++ b/ash/shell/content/client/shell_content_browser_client.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "content/public/browser/content_browser_client.h"
 
 namespace content {
diff --git a/ash/shell/content/client/shell_main_delegate.h b/ash/shell/content/client/shell_main_delegate.h
index 7daf1fa..71df8da 100644
--- a/ash/shell/content/client/shell_main_delegate.h
+++ b/ash/shell/content/client/shell_main_delegate.h
@@ -6,6 +6,7 @@
 #define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/app/content_main_delegate.h"
 #include "content/shell/common/shell_content_client.h"
diff --git a/ash/shell/content/shell_content_state_impl.h b/ash/shell/content/shell_content_state_impl.h
index eba8578..3559cdc 100644
--- a/ash/shell/content/shell_content_state_impl.h
+++ b/ash/shell/content/shell_content_state_impl.h
@@ -6,6 +6,7 @@
 #define ASH_SHELL_CONTENT_SHELL_CONTENT_STATE_IMPL_H_
 
 #include "ash/content/shell_content_state.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/shell/context_menu.h b/ash/shell/context_menu.h
index 7126298..072e457 100644
--- a/ash/shell/context_menu.h
+++ b/ash/shell/context_menu.h
@@ -7,7 +7,7 @@
 
 #include "ash/shelf/shelf_alignment_menu.h"
 #include "ash/shelf/shelf_types.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace aura {
diff --git a/ash/shell/panel_window.h b/ash/shell/panel_window.h
index f67f5d0..a146308 100644
--- a/ash/shell/panel_window.h
+++ b/ash/shell/panel_window.h
@@ -5,7 +5,7 @@
 #ifndef ASH_SHELL_PANEL_WINDOW_H_
 #define ASH_SHELL_PANEL_WINDOW_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/aura/aura_export.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
diff --git a/ash/shell/shelf_delegate_impl.h b/ash/shell/shelf_delegate_impl.h
index 6342a42..85d68ed 100644
--- a/ash/shell/shelf_delegate_impl.h
+++ b/ash/shell/shelf_delegate_impl.h
@@ -7,6 +7,7 @@
 
 #include "ash/shelf/shelf_delegate.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 65577c0..c98e1b2 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -9,6 +9,7 @@
 
 #include "ash/shell_delegate.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace keyboard {
 class KeyboardUI;
diff --git a/ash/shell/toplevel_window.h b/ash/shell/toplevel_window.h
index 1910451..6c51c5e 100644
--- a/ash/shell/toplevel_window.h
+++ b/ash/shell/toplevel_window.h
@@ -5,6 +5,7 @@
 #ifndef ASH_SHELL_TOPLEVEL_WINDOW_H_
 #define ASH_SHELL_TOPLEVEL_WINDOW_H_
 
+#include "base/macros.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
diff --git a/ash/shell/window_type_launcher.h b/ash/shell/window_type_launcher.h
index 0594912..4e81f6f 100644
--- a/ash/shell/window_type_launcher.h
+++ b/ash/shell/window_type_launcher.h
@@ -5,6 +5,7 @@
 #ifndef ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
 #define ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
 
+#include "base/macros.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/menu/menu_delegate.h"
diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h
index 001914d..cb28f94 100644
--- a/ash/shell/window_watcher.h
+++ b/ash/shell/window_watcher.h
@@ -5,11 +5,14 @@
 #ifndef ASH_SHELL_WINDOW_WATCHER_H_
 #define ASH_SHELL_WINDOW_WATCHER_H_
 
+#include <stdint.h>
+
 #include <map>
 
 #include "ash/shelf/shelf_item_types.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/display_observer.h"
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
index c122d1f..a9fbc0ea 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -7,8 +7,8 @@
 
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_types.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 namespace shell {
diff --git a/ash/sticky_keys/sticky_keys_controller.cc b/ash/sticky_keys/sticky_keys_controller.cc
index c014d57..0453d96 100644
--- a/ash/sticky_keys/sticky_keys_controller.cc
+++ b/ash/sticky_keys/sticky_keys_controller.cc
@@ -5,7 +5,6 @@
 #include "ash/sticky_keys/sticky_keys_controller.h"
 
 #include "ash/sticky_keys/sticky_keys_overlay.h"
-#include "base/basictypes.h"
 #include "base/debug/stack_trace.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tracker.h"
diff --git a/ash/sticky_keys/sticky_keys_controller.h b/ash/sticky_keys/sticky_keys_controller.h
index 1ebe1d8..c61b428 100644
--- a/ash/sticky_keys/sticky_keys_controller.h
+++ b/ash/sticky_keys/sticky_keys_controller.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/sticky_keys/sticky_keys_state.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
diff --git a/ash/switchable_windows.h b/ash/switchable_windows.h
index b0b4ee0..b7c4c21 100644
--- a/ash/switchable_windows.h
+++ b/ash/switchable_windows.h
@@ -5,6 +5,8 @@
 #ifndef ASH_SWITCHABLE_WINDOWS_H_
 #define ASH_SWITCHABLE_WINDOWS_H_
 
+#include <stddef.h>
+
 #include "ash/ash_export.h"
 #include "base/macros.h"
 
diff --git a/ash/system/audio/tray_audio.h b/ash/system/audio/tray_audio.h
index 9621eb8..9e2c7b5 100644
--- a/ash/system/audio/tray_audio.h
+++ b/ash/system/audio/tray_audio.h
@@ -5,8 +5,11 @@
 #ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_
 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_
 
+#include <stdint.h>
+
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/tray/tray_image_item.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/display_observer.h"
 
diff --git a/ash/system/audio/volume_view.h b/ash/system/audio/volume_view.h
index 7bbb79c..84e273c 100644
--- a/ash/system/audio/volume_view.h
+++ b/ash/system/audio/volume_view.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_
 
 #include "ash/system/tray/actionable_view.h"
+#include "base/macros.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/slider.h"
diff --git a/ash/system/bluetooth/tray_bluetooth.h b/ash/system/bluetooth/tray_bluetooth.h
index af04acf..0806ccd 100644
--- a/ash/system/bluetooth/tray_bluetooth.h
+++ b/ash/system/bluetooth/tray_bluetooth.h
@@ -7,6 +7,7 @@
 
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 
 namespace ash {
 namespace tray {
diff --git a/ash/system/cast/tray_cast.h b/ash/system/cast/tray_cast.h
index 69115ef..a148777 100644
--- a/ash/system/cast/tray_cast.h
+++ b/ash/system/cast/tray_cast.h
@@ -8,6 +8,7 @@
 #include "ash/cast_config_delegate.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 
 namespace ash {
diff --git a/ash/system/chromeos/audio/audio_detailed_view.h b/ash/system/chromeos/audio/audio_detailed_view.h
index dca993d..dbe52d4 100644
--- a/ash/system/chromeos/audio/audio_detailed_view.h
+++ b/ash/system/chromeos/audio/audio_detailed_view.h
@@ -7,8 +7,8 @@
 
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/view_click_listener.h"
+#include "base/macros.h"
 #include "chromeos/audio/audio_device.h"
-
 #include "ui/gfx/font.h"
 
 namespace views {
diff --git a/ash/system/chromeos/audio/tray_audio_chromeos.h b/ash/system/chromeos/audio/tray_audio_chromeos.h
index ed313e0..2397309 100644
--- a/ash/system/chromeos/audio/tray_audio_chromeos.h
+++ b/ash/system/chromeos/audio/tray_audio_chromeos.h
@@ -5,8 +5,11 @@
 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_
 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_
 
+#include <stdint.h>
+
 #include "ash/ash_export.h"
 #include "ash/system/audio/tray_audio.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/dbus/power_manager_client.h"
 
diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
index b0efc48..bb8164d 100644
--- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
+++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
@@ -209,7 +209,7 @@ void BluetoothNotificationController::DisplayPinCode(
 }
 
 void BluetoothNotificationController::DisplayPasskey(BluetoothDevice* device,
-                                                     uint32 passkey) {
+                                                     uint32_t passkey) {
   base::string16 message = l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PASSKEY,
           device->GetName(), base::UTF8ToUTF16(
@@ -219,12 +219,12 @@ void BluetoothNotificationController::DisplayPasskey(BluetoothDevice* device,
 }
 
 void BluetoothNotificationController::KeysEntered(BluetoothDevice* device,
-                                                  uint32 entered) {
+                                                  uint32_t entered) {
   // Ignored since we don't have CSS in the notification to update.
 }
 
 void BluetoothNotificationController::ConfirmPasskey(BluetoothDevice* device,
-                                                     uint32 passkey) {
+                                                     uint32_t passkey) {
   base::string16 message = l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_BLUETOOTH_CONFIRM_PASSKEY,
           device->GetName(), base::UTF8ToUTF16(
diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h
index 22b990d..9d7443c 100644
--- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h
+++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h
@@ -5,11 +5,13 @@
 #ifndef ASH_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
 #define ASH_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include <set>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
@@ -44,9 +46,11 @@ class ASH_EXPORT BluetoothNotificationController
   void RequestPasskey(device::BluetoothDevice* device) override;
   void DisplayPinCode(device::BluetoothDevice* device,
                       const std::string& pincode) override;
-  void DisplayPasskey(device::BluetoothDevice* device, uint32 passkey) override;
-  void KeysEntered(device::BluetoothDevice* device, uint32 entered) override;
-  void ConfirmPasskey(device::BluetoothDevice* device, uint32 passkey) override;
+  void DisplayPasskey(device::BluetoothDevice* device,
+                      uint32_t passkey) override;
+  void KeysEntered(device::BluetoothDevice* device, uint32_t entered) override;
+  void ConfirmPasskey(device::BluetoothDevice* device,
+                      uint32_t passkey) override;
   void AuthorizePairing(device::BluetoothDevice* device) override;
 
  private:
diff --git a/ash/system/chromeos/brightness/brightness_controller_chromeos.h b/ash/system/chromeos/brightness/brightness_controller_chromeos.h
index b2bc82a..663989a 100644
--- a/ash/system/chromeos/brightness/brightness_controller_chromeos.h
+++ b/ash/system/chromeos/brightness/brightness_controller_chromeos.h
@@ -7,8 +7,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/brightness_control_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 namespace system {
diff --git a/ash/system/chromeos/brightness/tray_brightness.h b/ash/system/chromeos/brightness/tray_brightness.h
index a69894b..dd05b99 100644
--- a/ash/system/chromeos/brightness/tray_brightness.h
+++ b/ash/system/chromeos/brightness/tray_brightness.h
@@ -7,6 +7,7 @@
 
 #include "ash/system/tray/system_tray_item.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/dbus/power_manager_client.h"
 
diff --git a/ash/system/chromeos/enterprise/tray_enterprise.h b/ash/system/chromeos/enterprise/tray_enterprise.h
index 5e58f15..916f4d4 100644
--- a/ash/system/chromeos/enterprise/tray_enterprise.h
+++ b/ash/system/chromeos/enterprise/tray_enterprise.h
@@ -8,6 +8,7 @@
 #include "ash/system/chromeos/enterprise/enterprise_domain_observer.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/view_click_listener.h"
+#include "base/macros.h"
 
 namespace views {
 class View;
diff --git a/ash/system/chromeos/keyboard_brightness_controller.h b/ash/system/chromeos/keyboard_brightness_controller.h
index bc3c79e..38130f9 100644
--- a/ash/system/chromeos/keyboard_brightness_controller.h
+++ b/ash/system/chromeos/keyboard_brightness_controller.h
@@ -7,8 +7,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/system/chromeos/label_tray_view.h b/ash/system/chromeos/label_tray_view.h
index d0c04a3..3cb48434 100644
--- a/ash/system/chromeos/label_tray_view.h
+++ b/ash/system/chromeos/label_tray_view.h
@@ -5,6 +5,7 @@
 #ifndef ASH_SYSTEM_CHROMEOS_LABEL_TRAY_VIEW_H_
 #define ASH_SYSTEM_CHROMEOS_LABEL_TRAY_VIEW_H_
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/views/view.h"
 
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.h b/ash/system/chromeos/network/network_state_list_detailed_view.h
index 79a097b..e637974 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.h
@@ -10,6 +10,7 @@
 #include "ash/system/chromeos/network/network_detailed_view.h"
 #include "ash/system/tray/view_click_listener.h"
 #include "ash/system/user/login_status.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/chromeos/network/network_list_delegate.h"
diff --git a/ash/system/chromeos/network/tray_network.h b/ash/system/chromeos/network/tray_network.h
index 72c0a09..97521ff 100644
--- a/ash/system/chromeos/network/tray_network.h
+++ b/ash/system/chromeos/network/tray_network.h
@@ -11,6 +11,7 @@
 #include "ash/system/chromeos/network/network_portal_detector_observer.h"
 #include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
diff --git a/ash/system/chromeos/network/tray_network_state_observer.h b/ash/system/chromeos/network/tray_network_state_observer.h
index d5f572b..59edc44 100644
--- a/ash/system/chromeos/network/tray_network_state_observer.h
+++ b/ash/system/chromeos/network/tray_network_state_observer.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/timer/timer.h"
 #include "chromeos/network/network_state_handler_observer.h"
 
diff --git a/ash/system/chromeos/network/tray_sms.h b/ash/system/chromeos/network/tray_sms.h
index cc6f2b7..e7d1790 100644
--- a/ash/system/chromeos/network/tray_sms.h
+++ b/ash/system/chromeos/network/tray_sms.h
@@ -5,9 +5,12 @@
 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
 
+#include <stddef.h>
+
 #include <string>
 
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 #include "base/values.h"
 #include "chromeos/network/network_sms_handler.h"
 
diff --git a/ash/system/chromeos/network/tray_vpn.h b/ash/system/chromeos/network/tray_vpn.h
index 9b56c82..4b22966 100644
--- a/ash/system/chromeos/network/tray_vpn.h
+++ b/ash/system/chromeos/network/tray_vpn.h
@@ -7,6 +7,7 @@
 
 #include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace ash {
diff --git a/ash/system/chromeos/power/battery_notification.h b/ash/system/chromeos/power/battery_notification.h
index cc89e6d..0fbd095 100644
--- a/ash/system/chromeos/power/battery_notification.h
+++ b/ash/system/chromeos/power/battery_notification.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/chromeos/power/tray_power.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace message_center {
diff --git a/ash/system/chromeos/power/dual_role_notification.h b/ash/system/chromeos/power/dual_role_notification.h
index d49ec08..8cd6ab3 100644
--- a/ash/system/chromeos/power/dual_role_notification.h
+++ b/ash/system/chromeos/power/dual_role_notification.h
@@ -5,8 +5,11 @@
 #ifndef ASH_SYSTEM_CHROMEOS_POWER_DUAL_ROLE_NOTIFICATION_H_
 #define ASH_SYSTEM_CHROMEOS_POWER_DUAL_ROLE_NOTIFICATION_H_
 
+#include <stddef.h>
+
 #include "ash/ash_export.h"
 #include "ash/system/chromeos/power/power_status.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace message_center {
diff --git a/ash/system/chromeos/power/power_event_observer.h b/ash/system/chromeos/power/power_event_observer.h
index 37fe5bb..eb5bc05 100644
--- a/ash/system/chromeos/power/power_event_observer.h
+++ b/ash/system/chromeos/power/power_event_observer.h
@@ -6,9 +6,9 @@
 #define ASH_SYSTEM_CHROMEOS_POWER_POWER_EVENT_OBSERVER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 
diff --git a/ash/system/chromeos/power/power_status.h b/ash/system/chromeos/power/power_status.h
index 85dd8d3..3f25985 100644
--- a/ash/system/chromeos/power/power_status.h
+++ b/ash/system/chromeos/power/power_status.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
diff --git a/ash/system/chromeos/power/power_status_view.h b/ash/system/chromeos/power/power_status_view.h
index a24ecc8..b1a319a 100644
--- a/ash/system/chromeos/power/power_status_view.h
+++ b/ash/system/chromeos/power/power_status_view.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/chromeos/power/power_status.h"
+#include "base/macros.h"
 #include "ui/views/view.h"
 
 namespace views {
diff --git a/ash/system/chromeos/power/tray_power.h b/ash/system/chromeos/power/tray_power.h
index 2c84658..6ecd06a 100644
--- a/ash/system/chromeos/power/tray_power.h
+++ b/ash/system/chromeos/power/tray_power.h
@@ -7,6 +7,7 @@
 
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 
 class SkBitmap;
 
diff --git a/ash/system/chromeos/power/video_activity_notifier.h b/ash/system/chromeos/power/video_activity_notifier.h
index 204f96f..c4ec22c 100644
--- a/ash/system/chromeos/power/video_activity_notifier.h
+++ b/ash/system/chromeos/power/video_activity_notifier.h
@@ -6,8 +6,8 @@
 #define ASH_SYSTEM_CHROMEOS_POWER_VIDEO_ACTIVITY_NOTIFIER_H_
 
 #include "ash/wm/video_detector.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 
 namespace ash {
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock.h b/ash/system/chromeos/rotation/tray_rotation_lock.h
index a1df95a..7928c78 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock.h
+++ b/ash/system/chromeos/rotation/tray_rotation_lock.h
@@ -8,6 +8,7 @@
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/tray_image_item.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
index 6ff259f..d389082 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
+++ b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
@@ -243,7 +243,7 @@ TEST_F(TrayRotationLockTest, PerformActionOnDefaultView) {
 // Tests that when the tray is created without the internal display being known,
 // that it will still display correctly once the internal display is known.
 TEST_F(TrayRotationLockTest, InternalDisplayNotAvailableAtCreation) {
-  int64 internal_display_id = gfx::Display::InternalDisplayId();
+  int64_t internal_display_id = gfx::Display::InternalDisplayId();
   TearDownViews();
   gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
 
diff --git a/ash/system/chromeos/screen_security/screen_capture_tray_item.h b/ash/system/chromeos/screen_security/screen_capture_tray_item.h
index bf408f6..c634b23 100644
--- a/ash/system/chromeos/screen_security/screen_capture_tray_item.h
+++ b/ash/system/chromeos/screen_security/screen_capture_tray_item.h
@@ -8,6 +8,7 @@
 #include "ash/shell_observer.h"
 #include "ash/system/chromeos/screen_security/screen_capture_observer.h"
 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
+#include "base/macros.h"
 
 namespace views {
 class View;
diff --git a/ash/system/chromeos/screen_security/screen_share_tray_item.h b/ash/system/chromeos/screen_security/screen_share_tray_item.h
index e4ab6d5..53704a5 100644
--- a/ash/system/chromeos/screen_security/screen_share_tray_item.h
+++ b/ash/system/chromeos/screen_security/screen_share_tray_item.h
@@ -7,6 +7,7 @@
 
 #include "ash/system/chromeos/screen_security/screen_share_observer.h"
 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
+#include "base/macros.h"
 
 namespace views {
 class View;
diff --git a/ash/system/chromeos/screen_security/screen_tray_item.h b/ash/system/chromeos/screen_security/screen_tray_item.h
index 4a2a12e..6e48357 100644
--- a/ash/system/chromeos/screen_security/screen_tray_item.h
+++ b/ash/system/chromeos/screen_security/screen_tray_item.h
@@ -11,6 +11,7 @@
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_notification_view.h"
 #include "ash/system/tray/tray_popup_label_button.h"
+#include "base/macros.h"
 #include "ui/message_center/notification_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/image_view.h"
diff --git a/ash/system/chromeos/session/last_window_closed_logout_reminder.h b/ash/system/chromeos/session/last_window_closed_logout_reminder.h
index ad18816..6fb254b 100644
--- a/ash/system/chromeos/session/last_window_closed_logout_reminder.h
+++ b/ash/system/chromeos/session/last_window_closed_logout_reminder.h
@@ -6,8 +6,8 @@
 #define ASH_SYSTEM_CHROMEOS_SESSION_LAST_WINDOW_CLOSED_LOGOUT_REMINDER_H_
 
 #include "ash/system/chromeos/session/last_window_closed_observer.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/system/chromeos/session/logout_button_tray.h b/ash/system/chromeos/session/logout_button_tray.h
index 4bdddf9..6e79801 100644
--- a/ash/system/chromeos/session/logout_button_tray.h
+++ b/ash/system/chromeos/session/logout_button_tray.h
@@ -9,8 +9,8 @@
 #include "ash/system/chromeos/session/logout_button_observer.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/user/login_status.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/views/controls/button/button.h"
 
diff --git a/ash/system/chromeos/session/logout_confirmation_controller.h b/ash/system/chromeos/session/logout_confirmation_controller.h
index 39db0f6..9fa1f28 100644
--- a/ash/system/chromeos/session/logout_confirmation_controller.h
+++ b/ash/system/chromeos/session/logout_confirmation_controller.h
@@ -7,8 +7,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
diff --git a/ash/system/chromeos/session/logout_confirmation_dialog.h b/ash/system/chromeos/session/logout_confirmation_dialog.h
index b469c58..61407b1 100644
--- a/ash/system/chromeos/session/logout_confirmation_dialog.h
+++ b/ash/system/chromeos/session/logout_confirmation_dialog.h
@@ -5,8 +5,8 @@
 #ifndef ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_
 #define ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/views/window/dialog_delegate.h"
diff --git a/ash/system/chromeos/session/tray_session_length_limit.h b/ash/system/chromeos/session/tray_session_length_limit.h
index fcfe3c7..67d9d9f 100644
--- a/ash/system/chromeos/session/tray_session_length_limit.h
+++ b/ash/system/chromeos/session/tray_session_length_limit.h
@@ -7,8 +7,8 @@
 
 #include "ash/system/chromeos/session/session_length_limit_observer.h"
 #include "ash/system/tray/system_tray_item.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
diff --git a/ash/system/chromeos/settings/tray_settings.h b/ash/system/chromeos/settings/tray_settings.h
index 37ece4c..c01982f 100644
--- a/ash/system/chromeos/settings/tray_settings.h
+++ b/ash/system/chromeos/settings/tray_settings.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
 
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 
 namespace ash {
 namespace tray {
diff --git a/ash/system/chromeos/supervised/tray_supervised_user.h b/ash/system/chromeos/supervised/tray_supervised_user.h
index 1f44fef..8a1158b 100644
--- a/ash/system/chromeos/supervised/tray_supervised_user.h
+++ b/ash/system/chromeos/supervised/tray_supervised_user.h
@@ -9,6 +9,7 @@
 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/view_click_listener.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 
 namespace ash {
diff --git a/ash/system/chromeos/system_clock_observer.h b/ash/system/chromeos/system_clock_observer.h
index 82d58e03..7211753 100644
--- a/ash/system/chromeos/system_clock_observer.h
+++ b/ash/system/chromeos/system_clock_observer.h
@@ -5,6 +5,7 @@
 #ifndef ASH_SYSTEM_CHROMEOS_SYSTEM_CLOCK_OBSERVER_H_
 #define ASH_SYSTEM_CHROMEOS_SYSTEM_CLOCK_OBSERVER_H_
 
+#include "base/macros.h"
 #include "chromeos/dbus/system_clock_client.h"
 #include "chromeos/settings/timezone_settings.h"
 
diff --git a/ash/system/chromeos/tray_caps_lock.h b/ash/system/chromeos/tray_caps_lock.h
index bf6ee89..4314ef4 100644
--- a/ash/system/chromeos/tray_caps_lock.h
+++ b/ash/system/chromeos/tray_caps_lock.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
 
 #include "ash/system/tray/tray_image_item.h"
+#include "base/macros.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index 32714d4..e4341ff 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -41,12 +41,12 @@ DisplayManager* GetDisplayManager() {
   return Shell::GetInstance()->display_manager();
 }
 
-base::string16 GetDisplayName(int64 display_id) {
+base::string16 GetDisplayName(int64_t display_id) {
   return base::UTF8ToUTF16(
       GetDisplayManager()->GetDisplayNameForId(display_id));
 }
 
-base::string16 GetDisplaySize(int64 display_id) {
+base::string16 GetDisplaySize(int64_t display_id) {
   DisplayManager* display_manager = GetDisplayManager();
 
   const gfx::Display* display = &display_manager->GetDisplayForId(display_id);
@@ -64,7 +64,7 @@ base::string16 GetDisplaySize(int64 display_id) {
 
 // Returns 1-line information for the specified display, like
 // "InternalDisplay: 1280x750"
-base::string16 GetDisplayInfoLine(int64 display_id) {
+base::string16 GetDisplayInfoLine(int64_t display_id) {
   const DisplayInfo& display_info =
       GetDisplayManager()->GetDisplayInfo(display_id);
   if (GetDisplayManager()->mirroring_display_id() == display_id)
@@ -91,7 +91,7 @@ base::string16 GetDisplayInfoLine(int64 display_id) {
 base::string16 GetAllDisplayInfo() {
   DisplayManager* display_manager = GetDisplayManager();
   std::vector<base::string16> lines;
-  int64 internal_id = gfx::Display::kInvalidDisplayID;
+  int64_t internal_id = gfx::Display::kInvalidDisplayID;
   // Make sure to show the internal display first.
   if (!display_manager->IsInUnifiedMode() &&
       gfx::Display::IsInternalDisplayId(display_manager->first_display_id())) {
@@ -100,7 +100,7 @@ base::string16 GetAllDisplayInfo() {
   }
 
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
-    int64 id = display_manager->GetDisplayAt(i).id();
+    int64_t id = display_manager->GetDisplayAt(i).id();
     if (id == internal_id)
       continue;
     lines.push_back(GetDisplayInfoLine(id));
@@ -188,9 +188,9 @@ class DisplayView : public ActionableView {
     DisplayManager* display_manager = GetDisplayManager();
     DCHECK(!display_manager->IsInMirrorMode());
 
-    int64 external_id = gfx::Display::kInvalidDisplayID;
+    int64_t external_id = gfx::Display::kInvalidDisplayID;
     for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
-      int64 id = display_manager->GetDisplayAt(i).id();
+      int64_t id = display_manager->GetDisplayAt(i).id();
       if (!gfx::Display::IsInternalDisplayId(id)) {
         external_id = id;
         break;
@@ -249,7 +249,7 @@ class DisplayView : public ActionableView {
     if (display_manager->IsInUnifiedMode())
       return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_UNIFIED);
 
-    int64 primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+    int64_t primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
     if (gfx::Display::HasInternalDisplay() &&
         !(gfx::Display::IsInternalDisplayId(primary_id))) {
       if (additional_message_out) {
@@ -308,7 +308,7 @@ void TrayDisplay::UpdateDisplayInfo(TrayDisplay::DisplayInfoMap* old_info) {
 
   DisplayManager* display_manager = GetDisplayManager();
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
-    int64 id = display_manager->GetDisplayAt(i).id();
+    int64_t id = display_manager->GetDisplayAt(i).id();
     display_info_[id] = display_manager->GetDisplayInfo(id);
   }
 }
diff --git a/ash/system/chromeos/tray_display.h b/ash/system/chromeos/tray_display.h
index 08309ce..7712b69 100644
--- a/ash/system/chromeos/tray_display.h
+++ b/ash/system/chromeos/tray_display.h
@@ -5,12 +5,15 @@
 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
 
+#include <stdint.h>
+
 #include <map>
 
 #include "ash/ash_export.h"
 #include "ash/display/display_info.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/views/view.h"
 
@@ -33,7 +36,7 @@ class ASH_EXPORT TrayDisplay : public SystemTrayItem,
  private:
   friend class TrayDisplayTest;
 
-  typedef std::map<int64, DisplayInfo> DisplayInfoMap;
+  typedef std::map<int64_t, DisplayInfo> DisplayInfoMap;
 
   static const char kNotificationId[];
 
diff --git a/ash/system/chromeos/tray_tracing.h b/ash/system/chromeos/tray_tracing.h
index f036a8c..d5e9c71 100644
--- a/ash/system/chromeos/tray_tracing.h
+++ b/ash/system/chromeos/tray_tracing.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/tray/tray_image_item.h"
+#include "base/macros.h"
 
 namespace views {
 class View;
diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
index 0a0230a..0905647 100644
--- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
+++ b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
@@ -8,7 +8,7 @@
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/user/login_status.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 
 namespace views {
diff --git a/ash/system/date/date_view.h b/ash/system/date/date_view.h
index b460a52..9ec54e1 100644
--- a/ash/system/date/date_view.h
+++ b/ash/system/date/date_view.h
@@ -9,6 +9,7 @@
 #include "ash/system/date/tray_date.h"
 #include "ash/system/tray/actionable_view.h"
 #include "base/i18n/time_formatting.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/views/view.h"
diff --git a/ash/system/date/tray_date.h b/ash/system/date/tray_date.h
index f2620b7..f4667b6 100644
--- a/ash/system/date/tray_date.h
+++ b/ash/system/date/tray_date.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/system/date/clock_observer.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace views {
diff --git a/ash/system/ime/tray_ime_chromeos.h b/ash/system/ime/tray_ime_chromeos.h
index 8ff1a87..7cf60cc 100644
--- a/ash/system/ime/tray_ime_chromeos.h
+++ b/ash/system/ime/tray_ime_chromeos.h
@@ -5,11 +5,14 @@
 #ifndef ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
 #define ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
 
+#include <stddef.h>
+
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
 #include "ash/system/ime/ime_observer.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray_accessibility.h"
+#include "base/macros.h"
 
 namespace views {
 class Label;
diff --git a/ash/system/locale/locale_notification_controller.h b/ash/system/locale/locale_notification_controller.h
index a98b5cf..da579f8 100644
--- a/ash/system/locale/locale_notification_controller.h
+++ b/ash/system/locale/locale_notification_controller.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "ash/system/locale/locale_observer.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/system/overview/overview_button_tray.h b/ash/system/overview/overview_button_tray.h
index d3988be..f863f44 100644
--- a/ash/system/overview/overview_button_tray.h
+++ b/ash/system/overview/overview_button_tray.h
@@ -9,6 +9,7 @@
 #include "ash/session/session_state_observer.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/tray_background_view.h"
+#include "base/macros.h"
 
 namespace views {
 class ImageView;
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
index 17a4a7c..b227b5d 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/system/user/login_status.h"
+#include "base/macros.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
diff --git a/ash/system/status_area_widget_delegate.h b/ash/system/status_area_widget_delegate.h
index 62dee2c..d14361f 100644
--- a/ash/system/status_area_widget_delegate.h
+++ b/ash/system/status_area_widget_delegate.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
+#include "base/macros.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/widget/widget_delegate.h"
diff --git a/ash/system/tray/actionable_view.h b/ash/system/tray/actionable_view.h
index 7baef57..aff5e76 100644
--- a/ash/system/tray/actionable_view.h
+++ b/ash/system/tray/actionable_view.h
@@ -6,8 +6,8 @@
 #define ASH_SYSTEM_TRAY_ACTIONABLE_VIEW_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/view.h"
 
 namespace ash {
diff --git a/ash/system/tray/default_system_tray_delegate.h b/ash/system/tray/default_system_tray_delegate.h
index 47c6da4..7503c28 100644
--- a/ash/system/tray/default_system_tray_delegate.h
+++ b/ash/system/tray/default_system_tray_delegate.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace ash {
diff --git a/ash/system/tray/fixed_sized_image_view.h b/ash/system/tray/fixed_sized_image_view.h
index abc2ed3..fefd13b 100644
--- a/ash/system/tray/fixed_sized_image_view.h
+++ b/ash/system/tray/fixed_sized_image_view.h
@@ -5,8 +5,8 @@
 #ifndef ASH_SYSTEM_TRAY_FIXED_SIZED_IMAGE_VIEW_H_
 #define ASH_SYSTEM_TRAY_FIXED_SIZED_IMAGE_VIEW_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/image_view.h"
 
 namespace ash {
diff --git a/ash/system/tray/fixed_sized_scroll_view.h b/ash/system/tray/fixed_sized_scroll_view.h
index 1b1923a..cafb28f 100644
--- a/ash/system/tray/fixed_sized_scroll_view.h
+++ b/ash/system/tray/fixed_sized_scroll_view.h
@@ -5,8 +5,8 @@
 #ifndef ASH_SYSTEM_TRAY_FIXED_SIZED_SCROLL_VIEW_H_
 #define ASH_SYSTEM_TRAY_FIXED_SIZED_SCROLL_VIEW_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/scroll_view.h"
 
 namespace ash {
diff --git a/ash/system/tray/hover_highlight_view.h b/ash/system/tray/hover_highlight_view.h
index 40819bd..6188cce 100644
--- a/ash/system/tray/hover_highlight_view.h
+++ b/ash/system/tray/hover_highlight_view.h
@@ -6,8 +6,8 @@
 #define ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_
 
 #include "ash/system/tray/actionable_view.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/text_constants.h"
 
diff --git a/ash/system/tray/media_security/multi_profile_media_tray_item.h b/ash/system/tray/media_security/multi_profile_media_tray_item.h
index fd9a729..122eafa 100644
--- a/ash/system/tray/media_security/multi_profile_media_tray_item.h
+++ b/ash/system/tray/media_security/multi_profile_media_tray_item.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_CHROMEOS_MULTI_PROFILE_MEDIA_TRAY_ITEM_H_
 
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 #include "ui/message_center/notification_delegate.h"
 #include "ui/views/view.h"
 
diff --git a/ash/system/tray/special_popup_row.h b/ash/system/tray/special_popup_row.h
index 1024e84..2c792d3 100644
--- a/ash/system/tray/special_popup_row.h
+++ b/ash/system/tray/special_popup_row.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/view.h"
 
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 1409216..9362f5b 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -10,8 +10,8 @@
 #include "ash/system/tray/system_tray_bubble.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/user/login_status.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/bubble/tray_bubble_view.h"
diff --git a/ash/system/tray/system_tray_bubble.h b/ash/system/tray/system_tray_bubble.h
index 122a314..4dd9bc4 100644
--- a/ash/system/tray/system_tray_bubble.h
+++ b/ash/system/tray/system_tray_bubble.h
@@ -6,7 +6,7 @@
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_
 
 #include "ash/system/user/login_status.h"
-#include "base/base_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/views/bubble/tray_bubble_view.h"
diff --git a/ash/system/tray/system_tray_item.h b/ash/system/tray/system_tray_item.h
index 61d214e..493a6db 100644
--- a/ash/system/tray/system_tray_item.h
+++ b/ash/system/tray/system_tray_item.h
@@ -8,8 +8,8 @@
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/system/user/login_status.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace views {
 class View;
diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h
index e9a61fb..6e92a7d 100644
--- a/ash/system/tray/system_tray_notifier.h
+++ b/ash/system/tray/system_tray_notifier.h
@@ -5,6 +5,8 @@
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
@@ -18,6 +20,7 @@
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/user/update_observer.h"
 #include "ash/system/user/user_observer.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 
 #if defined(OS_CHROMEOS)
diff --git a/ash/system/tray/throbber_view.h b/ash/system/tray/throbber_view.h
index f09dd8b..9faf3bf 100644
--- a/ash/system/tray/throbber_view.h
+++ b/ash/system/tray/throbber_view.h
@@ -5,6 +5,7 @@
 #ifndef ASH_SYSTEM_TRAY_THROBBER_VIEW_H_
 #define ASH_SYSTEM_TRAY_THROBBER_VIEW_H_
 
+#include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/view.h"
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index f1562b7..ef39134 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -9,6 +9,7 @@
 #include "ash/shelf/background_animator.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/system/tray/actionable_view.h"
+#include "base/macros.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
diff --git a/ash/system/tray/tray_bar_button_with_title.h b/ash/system/tray/tray_bar_button_with_title.h
index 92e1d5b..1da52df 100644
--- a/ash/system/tray/tray_bar_button_with_title.h
+++ b/ash/system/tray/tray_bar_button_with_title.h
@@ -5,8 +5,8 @@
 #ifndef ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_
 #define ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/custom_button.h"
 
 namespace views {
diff --git a/ash/system/tray/tray_bubble_wrapper.h b/ash/system/tray/tray_bubble_wrapper.h
index 6950377..d91b6f9 100644
--- a/ash/system/tray/tray_bubble_wrapper.h
+++ b/ash/system/tray/tray_bubble_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef ASH_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_
 #define ASH_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/widget/widget_observer.h"
 
diff --git a/ash/system/tray/tray_details_view.h b/ash/system/tray/tray_details_view.h
index e341109..f0d482c 100644
--- a/ash/system/tray/tray_details_view.h
+++ b/ash/system/tray/tray_details_view.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/tray/special_popup_row.h"
+#include "base/macros.h"
 #include "ui/views/view.h"
 
 namespace views {
diff --git a/ash/system/tray/tray_empty.h b/ash/system/tray/tray_empty.h
index f427d41..680012e 100644
--- a/ash/system/tray/tray_empty.h
+++ b/ash/system/tray/tray_empty.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_TRAY_TRAY_EMPTY_H_
 
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/system/tray/tray_event_filter.h b/ash/system/tray/tray_event_filter.h
index 7bb3940..86f5545 100644
--- a/ash/system/tray/tray_event_filter.h
+++ b/ash/system/tray/tray_event_filter.h
@@ -7,7 +7,7 @@
 
 #include <set>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/system/tray/tray_image_item.h b/ash/system/tray/tray_image_item.h
index 64a28c1..f9c2659f 100644
--- a/ash/system/tray/tray_image_item.h
+++ b/ash/system/tray/tray_image_item.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
 
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 
 namespace views {
 class ImageView;
diff --git a/ash/system/tray/tray_item_more.h b/ash/system/tray/tray_item_more.h
index 81f2ca2..afebb07 100644
--- a/ash/system/tray/tray_item_more.h
+++ b/ash/system/tray/tray_item_more.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
 
 #include "ash/system/tray/actionable_view.h"
+#include "base/macros.h"
 #include "ui/views/view.h"
 
 namespace views {
diff --git a/ash/system/tray/tray_item_view.h b/ash/system/tray/tray_item_view.h
index 55c0d35..015c6d9 100644
--- a/ash/system/tray/tray_item_view.h
+++ b/ash/system/tray/tray_item_view.h
@@ -6,6 +6,7 @@
 #define ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/view.h"
 
diff --git a/ash/system/tray/tray_notification_view.h b/ash/system/tray/tray_notification_view.h
index 5b3b6e2..17c737e 100644
--- a/ash/system/tray/tray_notification_view.h
+++ b/ash/system/tray/tray_notification_view.h
@@ -5,6 +5,7 @@
 #ifndef ASH_SYSTEM_TRAY_TRAY_NOTIFICATION_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_NOTIFICATION_VIEW_H_
 
+#include "base/macros.h"
 #include "base/timer/timer.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/slide_out_view.h"
diff --git a/ash/system/tray/tray_popup_header_button.h b/ash/system/tray/tray_popup_header_button.h
index 9d9fb46..767dbdd 100644
--- a/ash/system/tray/tray_popup_header_button.h
+++ b/ash/system/tray/tray_popup_header_button.h
@@ -6,8 +6,8 @@
 #define ASH_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/image_button.h"
 
 namespace ash {
diff --git a/ash/system/tray/tray_popup_item_container.h b/ash/system/tray/tray_popup_item_container.h
index 3771b5c..3da1615 100644
--- a/ash/system/tray/tray_popup_item_container.h
+++ b/ash/system/tray/tray_popup_item_container.h
@@ -5,6 +5,7 @@
 #ifndef ASH_SYSTEM_TRAY_TRAY_POPUP_ITEM_CONTAINER_H_
 #define ASH_SYSTEM_TRAY_TRAY_POPUP_ITEM_CONTAINER_H_
 
+#include "base/macros.h"
 #include "ui/views/view.h"
 
 namespace ash {
diff --git a/ash/system/tray/tray_popup_label_button.h b/ash/system/tray/tray_popup_label_button.h
index 16e7f43..a826c93 100644
--- a/ash/system/tray/tray_popup_label_button.h
+++ b/ash/system/tray/tray_popup_label_button.h
@@ -5,8 +5,8 @@
 #ifndef ASH_SYSTEM_TRAY_TRAY_POPUP_LABEL_BUTTON_H_
 #define ASH_SYSTEM_TRAY_TRAY_POPUP_LABEL_BUTTON_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/views/controls/button/label_button.h"
 
diff --git a/ash/system/tray/tray_popup_label_button_border.h b/ash/system/tray/tray_popup_label_button_border.h
index c61a2be..c454e9c 100644
--- a/ash/system/tray/tray_popup_label_button_border.h
+++ b/ash/system/tray/tray_popup_label_button_border.h
@@ -5,8 +5,8 @@
 #ifndef ASH_SYSTEM_TRAY_TRAY_POPUP_LABEL_BUTTON_BORDER_H_
 #define ASH_SYSTEM_TRAY_TRAY_POPUP_LABEL_BUTTON_BORDER_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/label_button_border.h"
 
 namespace ash {
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index eba3bf0..25a3de9 100644
--- a/ash/system/tray_accessibility.cc
+++ b/ash/system/tray_accessibility.cc
@@ -41,10 +41,10 @@ enum AccessibilityState {
   A11Y_BRAILLE_DISPLAY_CONNECTED = 1 << 6,
 };
 
-uint32 GetAccessibilityState() {
+uint32_t GetAccessibilityState() {
   AccessibilityDelegate* delegate =
       Shell::GetInstance()->accessibility_delegate();
-  uint32 state = A11Y_NONE;
+  uint32_t state = A11Y_NONE;
   if (delegate->IsSpokenFeedbackEnabled())
     state |= A11Y_SPOKEN_FEEDBACK;
   if (delegate->IsHighContrastEnabled())
@@ -94,13 +94,13 @@ class DefaultAccessibilityView : public TrayItemMore {
 // ash::tray::AccessibilityPopupView
 
 AccessibilityPopupView::AccessibilityPopupView(SystemTrayItem* owner,
-                                               uint32 enabled_state_bits)
+                                               uint32_t enabled_state_bits)
     : TrayNotificationView(owner, IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK),
       label_(CreateLabel(enabled_state_bits)) {
   InitView(label_);
 }
 
-views::Label* AccessibilityPopupView::CreateLabel(uint32 enabled_state_bits) {
+views::Label* AccessibilityPopupView::CreateLabel(uint32_t enabled_state_bits) {
   DCHECK((enabled_state_bits &
           (A11Y_SPOKEN_FEEDBACK | A11Y_BRAILLE_DISPLAY_CONNECTED)) != 0);
   base::string16 text;
@@ -403,7 +403,7 @@ void TrayAccessibility::OnAccessibilityModeChanged(
     ui::AccessibilityNotificationVisibility notify) {
   SetTrayIconVisible(GetInitialVisibility());
 
-  uint32 accessibility_state = GetAccessibilityState();
+  uint32_t accessibility_state = GetAccessibilityState();
   // We'll get an extra notification if a braille display is connected when
   // spoken feedback wasn't already enabled.  This is because the braille
   // connection state is already updated when spoken feedback is enabled so
@@ -413,7 +413,7 @@ void TrayAccessibility::OnAccessibilityModeChanged(
     return;
   // Contains bits for spoken feedback and braille display connected currently
   // being enabled.
-  uint32 being_enabled =
+  uint32_t being_enabled =
       (accessibility_state & ~previous_accessibility_state_) &
       (A11Y_SPOKEN_FEEDBACK | A11Y_BRAILLE_DISPLAY_CONNECTED);
   if ((notify == ui::A11Y_NOTIFICATION_SHOW) && being_enabled != A11Y_NONE) {
diff --git a/ash/system/tray_accessibility.h b/ash/system/tray_accessibility.h
index a890aaa..0927ad9 100644
--- a/ash/system/tray_accessibility.h
+++ b/ash/system/tray_accessibility.h
@@ -5,12 +5,15 @@
 #ifndef ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
 #define ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
 
+#include <stdint.h>
+
 #include "ash/accessibility_delegate.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_image_item.h"
 #include "ash/system/tray/tray_notification_view.h"
 #include "ash/system/tray/view_click_listener.h"
+#include "base/macros.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/button.h"
 
@@ -43,12 +46,12 @@ namespace tray {
 
 class AccessibilityPopupView : public TrayNotificationView {
  public:
-  AccessibilityPopupView(SystemTrayItem* owner, uint32 enabled_state_bits);
+  AccessibilityPopupView(SystemTrayItem* owner, uint32_t enabled_state_bits);
 
   const views::Label* label_for_test() const { return label_; }
 
  private:
-  views::Label* CreateLabel(uint32 enabled_state_bits);
+  views::Label* CreateLabel(uint32_t enabled_state_bits);
 
   views::Label* label_;
 
@@ -130,13 +133,13 @@ class TrayAccessibility : public TrayImageItem,
 
   // Bitmap of fvalues from AccessibilityState.  Can contain any or
   // both of A11Y_SPOKEN_FEEDBACK A11Y_BRAILLE_DISPLAY_CONNECTED.
-  uint32 request_popup_view_state_;
+  uint32_t request_popup_view_state_;
 
   bool tray_icon_visible_;
   user::LoginStatus login_;
 
   // Bitmap of values from AccessibilityState enum.
-  uint32 previous_accessibility_state_;
+  uint32_t previous_accessibility_state_;
 
   // A11y feature status on just entering the lock screen.
   bool show_a11y_menu_on_lock_screen_;
diff --git a/ash/system/tray_update.h b/ash/system/tray_update.h
index 7de9dae..c0fc5b8 100644
--- a/ash/system/tray_update.h
+++ b/ash/system/tray_update.h
@@ -8,6 +8,7 @@
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_image_item.h"
 #include "ash/system/user/update_observer.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace views {
diff --git a/ash/system/user/tray_user.h b/ash/system/user/tray_user.h
index bbbb5a7..3f93025 100644
--- a/ash/system/user/tray_user.h
+++ b/ash/system/user/tray_user.h
@@ -10,6 +10,7 @@
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/user/user_observer.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace gfx {
 class Rect;
diff --git a/ash/system/user/tray_user_separator.h b/ash/system/user/tray_user_separator.h
index 2a7ab780..76fd9b2 100644
--- a/ash/system/user/tray_user_separator.h
+++ b/ash/system/user/tray_user_separator.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.h b/ash/system/web_notification/ash_popup_alignment_delegate.h
index dd57b40..5e37ea7 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate.h
+++ b/ash/system/web_notification/ash_popup_alignment_delegate.h
@@ -5,6 +5,8 @@
 #ifndef ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
 #define ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
 
+#include <stdint.h>
+
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_types.h"
diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h
index af79b53..358b02a 100644
--- a/ash/system/web_notification/web_notification_tray.h
+++ b/ash/system/web_notification/web_notification_tray.h
@@ -9,6 +9,7 @@
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/user/login_status.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/base/models/simple_menu_model.h"
diff --git a/ash/system/win/audio/tray_audio_win.h b/ash/system/win/audio/tray_audio_win.h
index 0e410ab..d34a886 100644
--- a/ash/system/win/audio/tray_audio_win.h
+++ b/ash/system/win/audio/tray_audio_win.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/audio/tray_audio.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace ash {
diff --git a/ash/test/app_list_controller_test_api.h b/ash/test/app_list_controller_test_api.h
index 6d59bca..b0fadc3 100644
--- a/ash/test/app_list_controller_test_api.h
+++ b/ash/test/app_list_controller_test_api.h
@@ -5,7 +5,7 @@
 #ifndef ASH_TEST_APP_LIST_CONTROLLER_TEST_API_H_
 #define ASH_TEST_APP_LIST_CONTROLLER_TEST_API_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace app_list {
 class AppListView;
diff --git a/ash/test/ash_interactive_ui_test_base.h b/ash/test/ash_interactive_ui_test_base.h
index 742e46f..b6526b4 100644
--- a/ash/test/ash_interactive_ui_test_base.h
+++ b/ash/test/ash_interactive_ui_test_base.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "ash/test/ash_test_base.h"
+#include "base/macros.h"
 
 namespace ash {
 namespace test {
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index fa706e0..4232333 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -180,7 +180,7 @@ ui::test::EventGenerator& AshTestBase::GetEventGenerator() {
   return *event_generator_.get();
 }
 
-gfx::Display::Rotation AshTestBase::GetActiveDisplayRotation(int64 id) {
+gfx::Display::Rotation AshTestBase::GetActiveDisplayRotation(int64_t id) {
   return Shell::GetInstance()
       ->display_manager()
       ->GetDisplayInfo(id)
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index abc6f5d..c8aa736 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -5,9 +5,12 @@
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -101,7 +104,7 @@ class AshTestBase : public testing::Test {
   };
 
   // Returns the rotation currentl active for the display |id|.
-  static gfx::Display::Rotation GetActiveDisplayRotation(int64 id);
+  static gfx::Display::Rotation GetActiveDisplayRotation(int64_t id);
 
   // Returns the rotation currently active for the internal display.
   static gfx::Display::Rotation GetCurrentInternalDisplayRotation();
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index e324fe4..25553f2 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -6,6 +6,7 @@
 #define ASH_TEST_ASH_TEST_HELPER_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace aura {
diff --git a/ash/test/ash_test_views_delegate.h b/ash/test/ash_test_views_delegate.h
index 1a23ea5..9ba06725 100644
--- a/ash/test/ash_test_views_delegate.h
+++ b/ash/test/ash_test_views_delegate.h
@@ -5,6 +5,7 @@
 #ifndef ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_
 #define ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_
 
+#include "base/macros.h"
 #include "ui/views/test/test_views_delegate.h"
 
 namespace ash {
diff --git a/ash/test/child_modal_window.h b/ash/test/child_modal_window.h
index f0c6f01..d094102 100644
--- a/ash/test/child_modal_window.h
+++ b/ash/test/child_modal_window.h
@@ -5,6 +5,7 @@
 #ifndef ASH_TEST_CHILD_MODAL_WINDOW_H_
 #define ASH_TEST_CHILD_MODAL_WINDOW_H_
 
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
diff --git a/ash/test/content/test_shell_content_state.h b/ash/test/content/test_shell_content_state.h
index 9b06dbe..d8c5ac7 100644
--- a/ash/test/content/test_shell_content_state.h
+++ b/ash/test/content/test_shell_content_state.h
@@ -6,6 +6,7 @@
 #define ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_
 
 #include "ash/content/shell_content_state.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace content {
diff --git a/ash/test/cursor_manager_test_api.h b/ash/test/cursor_manager_test_api.h
index fce98ca..8542504 100644
--- a/ash/test/cursor_manager_test_api.h
+++ b/ash/test/cursor_manager_test_api.h
@@ -5,7 +5,7 @@
 #ifndef ASH_TEST_CURSOR_MANAGER_TEST_API_H_
 #define ASH_TEST_CURSOR_MANAGER_TEST_API_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc
index 9bad891..8de31dc 100644
--- a/ash/test/display_manager_test_api.cc
+++ b/ash/test/display_manager_test_api.cc
@@ -45,8 +45,8 @@ std::vector<DisplayInfo> CreateDisplayInfoListFromString(
 
   for (std::vector<std::string>::const_iterator iter = parts.begin();
        iter != parts.end(); ++iter, ++index) {
-    int64 id = (index < list.size()) ? list[index].id()
-                                     : gfx::Display::kInvalidDisplayID;
+    int64_t id = (index < list.size()) ? list[index].id()
+                                       : gfx::Display::kInvalidDisplayID;
     display_info_list.push_back(
         DisplayInfo::CreateFromSpecWithID(*iter, id));
   }
@@ -117,13 +117,13 @@ void DisplayManagerTestApi::UpdateDisplay(
   display_manager_->RunPendingTasksForTest();
 }
 
-int64 DisplayManagerTestApi::SetFirstDisplayAsInternalDisplay() {
+int64_t DisplayManagerTestApi::SetFirstDisplayAsInternalDisplay() {
   const gfx::Display& internal = display_manager_->active_display_list_[0];
   SetInternalDisplayId(internal.id());
   return gfx::Display::InternalDisplayId();
 }
 
-void DisplayManagerTestApi::SetInternalDisplayId(int64 id) {
+void DisplayManagerTestApi::SetInternalDisplayId(int64_t id) {
   gfx::Display::SetInternalDisplayId(id);
   display_manager_->UpdateInternalDisplayModeListForTest();
 }
@@ -133,7 +133,7 @@ void DisplayManagerTestApi::DisableChangeDisplayUponHostResize() {
 }
 
 void DisplayManagerTestApi::SetAvailableColorProfiles(
-    int64 display_id,
+    int64_t display_id,
     const std::vector<ui::ColorCalibrationProfile>& profiles) {
   display_manager_->display_info_[display_id].set_available_color_profiles(
       profiles);
@@ -147,7 +147,7 @@ ScopedDisable125DSFForUIScaling::~ScopedDisable125DSFForUIScaling() {
   DisplayInfo::SetUse125DSFForUIScalingForTest(true);
 }
 
-ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(int64 id) {
+ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(int64_t id) {
   DisplayManagerTestApi().SetInternalDisplayId(id);
 }
 
@@ -155,7 +155,7 @@ ScopedSetInternalDisplayId::~ScopedSetInternalDisplayId() {
   gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
 }
 
-bool SetDisplayResolution(int64 display_id, const gfx::Size& resolution) {
+bool SetDisplayResolution(int64_t display_id, const gfx::Size& resolution) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const DisplayInfo& info = display_manager->GetDisplayInfo(display_id);
   DisplayMode mode;
diff --git a/ash/test/display_manager_test_api.h b/ash/test/display_manager_test_api.h
index 4bb070d..d3c19ff 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
diff --git a/ash/test/mirror_window_test_api.h b/ash/test/mirror_window_test_api.h
index 9c62d2a..650be7c 100644
--- a/ash/test/mirror_window_test_api.h
+++ b/ash/test/mirror_window_test_api.h
@@ -5,7 +5,7 @@
 #ifndef ASH_TEST_MIRROR_WINDOW_TEST_API_H_
 #define ASH_TEST_MIRROR_WINDOW_TEST_API_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace aura {
diff --git a/ash/test/overflow_bubble_view_test_api.h b/ash/test/overflow_bubble_view_test_api.h
index 2bd5f27..9c91327 100644
--- a/ash/test/overflow_bubble_view_test_api.h
+++ b/ash/test/overflow_bubble_view_test_api.h
@@ -5,7 +5,7 @@
 #ifndef ASH_TEST_OVERFLOW_BUBBLE_VIEW_TEST_API_
 #define ASH_TEST_OVERFLOW_BUBBLE_VIEW_TEST_API_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace gfx {
 class Size;
diff --git a/ash/test/shelf_item_delegate_manager_test_api.h b/ash/test/shelf_item_delegate_manager_test_api.h
index 183bab5..e68c5d9 100644
--- a/ash/test/shelf_item_delegate_manager_test_api.h
+++ b/ash/test/shelf_item_delegate_manager_test_api.h
@@ -5,7 +5,7 @@
 #ifndef ASH_TEST_SHELF_ITEM_DELEGATE_MANAGER_TEST_API_H_
 #define ASH_TEST_SHELF_ITEM_DELEGATE_MANAGER_TEST_API_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/test/shelf_test_api.h b/ash/test/shelf_test_api.h
index 7c353ab..94e86fb 100644
--- a/ash/test/shelf_test_api.h
+++ b/ash/test/shelf_test_api.h
@@ -5,7 +5,7 @@
 #ifndef ASH_TEST_SHELF_TEST_API_H_
 #define ASH_TEST_SHELF_TEST_API_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/test/shelf_view_test_api.h b/ash/test/shelf_view_test_api.h
index c8a8a5f..9d5f594 100644
--- a/ash/test/shelf_view_test_api.h
+++ b/ash/test/shelf_view_test_api.h
@@ -7,7 +7,7 @@
 
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_types.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace gfx {
 class Rect;
diff --git a/ash/test/shell_test_api.h b/ash/test/shell_test_api.h
index 5afd594..654e425 100644
--- a/ash/test/shell_test_api.h
+++ b/ash/test/shell_test_api.h
@@ -5,7 +5,7 @@
 #ifndef ASH_TEST_SHELL_TEST_API_H_
 #define ASH_TEST_SHELL_TEST_API_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace ash {
 class AppListController;
diff --git a/ash/test/task_switch_time_tracker_test_api.h b/ash/test/task_switch_time_tracker_test_api.h
index 4214485..b45dfe0 100644
--- a/ash/test/task_switch_time_tracker_test_api.h
+++ b/ash/test/task_switch_time_tracker_test_api.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
diff --git a/ash/test/test_activation_delegate.h b/ash/test/test_activation_delegate.h
index 9c3ddbb..ca9c7f1 100644
--- a/ash/test/test_activation_delegate.h
+++ b/ash/test/test_activation_delegate.h
@@ -7,6 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 #include "ui/wm/public/activation_change_observer.h"
 #include "ui/wm/public/activation_delegate.h"
diff --git a/ash/test/test_keyboard_ui.h b/ash/test/test_keyboard_ui.h
index 2b8a24e..47afda6 100644
--- a/ash/test/test_keyboard_ui.h
+++ b/ash/test/test_keyboard_ui.h
@@ -5,6 +5,7 @@
 #ifndef ASH_TEST_TEST_KEYBOARD_UI_H_
 #define ASH_TEST_TEST_KEYBOARD_UI_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/keyboard/keyboard_ui.h"
diff --git a/ash/test/test_lock_state_controller_delegate.h b/ash/test/test_lock_state_controller_delegate.h
index 1f633e7..d38da4e 100644
--- a/ash/test/test_lock_state_controller_delegate.h
+++ b/ash/test/test_lock_state_controller_delegate.h
@@ -6,6 +6,7 @@
 #define ASH_TEST_TEST_LOCK_STATE_CONTROLLER_DELEGATE_H_
 
 #include "ash/wm/lock_state_controller.h"
+#include "base/macros.h"
 
 namespace ash {
 namespace test {
diff --git a/ash/test/test_overlay_delegate.h b/ash/test/test_overlay_delegate.h
index 16abad1..3211765 100644
--- a/ash/test/test_overlay_delegate.h
+++ b/ash/test/test_overlay_delegate.h
@@ -6,6 +6,7 @@
 #define ASH_TEST_TEST_OVERLAY_DELEGATE_H_
 
 #include "ash/wm/overlay_event_filter.h"
+#include "base/macros.h"
 
 namespace ash {
 namespace test {
diff --git a/ash/test/test_screenshot_delegate.h b/ash/test/test_screenshot_delegate.h
index 075b803..2ada0ab 100644
--- a/ash/test/test_screenshot_delegate.h
+++ b/ash/test/test_screenshot_delegate.h
@@ -6,8 +6,8 @@
 #define ASH_TEST_TEST_SCREENSHOT_DELEGATE_H_
 
 #include "ash/screenshot_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
diff --git a/ash/test/test_session_state_animator.h b/ash/test/test_session_state_animator.h
index 44206ec..1668dfd 100644
--- a/ash/test/test_session_state_animator.h
+++ b/ash/test/test_session_state_animator.h
@@ -5,12 +5,14 @@
 #ifndef ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_
 #define ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/wm/session_state_animator.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 
 namespace ash {
diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h
index ade02f5..12f6d54 100644
--- a/ash/test/test_session_state_delegate.h
+++ b/ash/test/test_session_state_delegate.h
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "ash/session/session_state_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/image/image_skia.h"
 
diff --git a/ash/test/test_shelf_delegate.h b/ash/test/test_shelf_delegate.h
index d4934ac..4c7bc93 100644
--- a/ash/test/test_shelf_delegate.h
+++ b/ash/test/test_shelf_delegate.h
@@ -11,6 +11,7 @@
 
 #include "ash/shelf/shelf_delegate.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/aura/window_observer.h"
 
 namespace ash {
diff --git a/ash/test/test_shelf_item_delegate.h b/ash/test/test_shelf_item_delegate.h
index 370a6b7..cba7721 100644
--- a/ash/test/test_shelf_item_delegate.h
+++ b/ash/test/test_shelf_item_delegate.h
@@ -6,8 +6,8 @@
 #define ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_
 
 #include "ash/shelf/shelf_item_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 2377fdf..2985ff1 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -11,6 +11,7 @@
 #include "ash/shell_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 
diff --git a/ash/test/test_system_tray_delegate.h b/ash/test/test_system_tray_delegate.h
index a8384ca..73da296 100644
--- a/ash/test/test_system_tray_delegate.h
+++ b/ash/test/test_system_tray_delegate.h
@@ -6,6 +6,7 @@
 #define ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
 
 #include "ash/system/tray/default_system_tray_delegate.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 
 namespace ash {
diff --git a/ash/test/test_user_wallpaper_delegate.h b/ash/test/test_user_wallpaper_delegate.h
index d2d49fc..8b5779a 100644
--- a/ash/test/test_user_wallpaper_delegate.h
+++ b/ash/test/test_user_wallpaper_delegate.h
@@ -7,6 +7,7 @@
 
 #include "ash/default_user_wallpaper_delegate.h"
 
+#include "base/macros.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace ash {
diff --git a/ash/test/test_volume_control_delegate.h b/ash/test/test_volume_control_delegate.h
index 69bf5d6..2b96664 100644
--- a/ash/test/test_volume_control_delegate.h
+++ b/ash/test/test_volume_control_delegate.h
@@ -6,6 +6,7 @@
 #define ASH_TEST_TEST_VOLUME_CONTROL_DELEGATE_H_
 
 #include "ash/volume_control_delegate.h"
+#include "base/macros.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace ash {
diff --git a/ash/test/tray_cast_test_api.h b/ash/test/tray_cast_test_api.h
index 5e0610f..a69b727 100644
--- a/ash/test/tray_cast_test_api.h
+++ b/ash/test/tray_cast_test_api.h
@@ -9,6 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/cast/tray_cast.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/touch/touch_hud_debug.h b/ash/touch/touch_hud_debug.h
index 547ab27..25fa414 100644
--- a/ash/touch/touch_hud_debug.h
+++ b/ash/touch/touch_hud_debug.h
@@ -5,10 +5,13 @@
 #ifndef ASH_TOUCH_TOUCH_HUD_DEBUG_H_
 #define ASH_TOUCH_TOUCH_HUD_DEBUG_H_
 
+#include <stdint.h>
+
 #include <map>
 
 #include "ash/ash_export.h"
 #include "ash/touch/touch_observer_hud.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
diff --git a/ash/touch/touch_hud_projection.h b/ash/touch/touch_hud_projection.h
index 2394976..ec0f8a2 100644
--- a/ash/touch/touch_hud_projection.h
+++ b/ash/touch/touch_hud_projection.h
@@ -8,6 +8,7 @@
 #include <map>
 
 #include "ash/touch/touch_observer_hud.h"
+#include "base/macros.h"
 
 namespace ash {
 class TouchPointView;
diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
index 1a558ee..4168f37 100644
--- a/ash/touch/touch_observer_hud.h
+++ b/ash/touch/touch_observer_hud.h
@@ -5,8 +5,11 @@
 #ifndef ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
 #define ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
 
+#include <stdint.h>
+
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/views/widget/widget_observer.h"
@@ -38,7 +41,7 @@ class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
   // Removes the HUD from the screen.
   void Remove();
 
-  int64 display_id() const { return display_id_; }
+  int64_t display_id() const { return display_id_; }
 
  protected:
   explicit TouchObserverHUD(aura::Window* initial_root);
@@ -78,7 +81,7 @@ class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
  private:
   friend class TouchHudTestBase;
 
-  const int64 display_id_;
+  const int64_t display_id_;
   aura::Window* root_window_;
 
   views::Widget* widget_;
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc
index f7293a5..e9d544e 100644
--- a/ash/touch/touch_observer_hud_unittest.cc
+++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -118,13 +118,9 @@ class TouchHudTestBase : public test::AshTestBase {
     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() {
@@ -183,7 +179,7 @@ class TouchHudTestBase : public test::AshTestBase {
     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;
@@ -197,9 +193,9 @@ class TouchHudTestBase : public test::AshTestBase {
     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_;
diff --git a/ash/touch/touch_transformer_controller.cc b/ash/touch/touch_transformer_controller.cc
index 142fdf1..0af8c8d 100644
--- a/ash/touch/touch_transformer_controller.cc
+++ b/ash/touch/touch_transformer_controller.cc
@@ -154,12 +154,12 @@ void TouchTransformerController::UpdateTouchTransformer() const {
   device_manager->ClearTouchDeviceAssociations();
 
   // Display IDs and DisplayInfo for mirror or extended mode.
-  int64 display1_id = gfx::Display::kInvalidDisplayID;
-  int64 display2_id = gfx::Display::kInvalidDisplayID;
+  int64_t display1_id = gfx::Display::kInvalidDisplayID;
+  int64_t display2_id = gfx::Display::kInvalidDisplayID;
   DisplayInfo display1;
   DisplayInfo display2;
   // Display ID and DisplayInfo for single display mode.
-  int64 single_display_id = gfx::Display::kInvalidDisplayID;
+  int64_t single_display_id = gfx::Display::kInvalidDisplayID;
   DisplayInfo single_display;
 
   WindowTreeHostManager* window_tree_host_manager =
diff --git a/ash/touch/touch_transformer_controller.h b/ash/touch/touch_transformer_controller.h
index d8406e9..2c6cb35 100644
--- a/ash/touch/touch_transformer_controller.h
+++ b/ash/touch/touch_transformer_controller.h
@@ -5,9 +5,12 @@
 #ifndef ASH_TOUCH_TOUCH_TRANSFORMER_CONTROLLER_H_
 #define ASH_TOUCH_TOUCH_TRANSFORMER_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "ui/gfx/transform.h"
 
 namespace ui {
diff --git a/ash/touch/touch_transformer_controller_unittest.cc b/ash/touch/touch_transformer_controller_unittest.cc
index 6ae0bd4..07f0b6f 100644
--- a/ash/touch/touch_transformer_controller_unittest.cc
+++ b/ash/touch/touch_transformer_controller_unittest.cc
@@ -14,7 +14,7 @@ namespace ash {
 
 namespace {
 
-DisplayInfo CreateDisplayInfo(int64 id,
+DisplayInfo CreateDisplayInfo(int64_t id,
                               unsigned int touch_device_id,
                               const gfx::Rect& bounds) {
   DisplayInfo info(id, std::string(), false);
diff --git a/ash/touch/touch_uma.h b/ash/touch/touch_uma.h
index 9e99414..7af5204 100644
--- a/ash/touch/touch_uma.h
+++ b/ash/touch/touch_uma.h
@@ -8,6 +8,7 @@
 #include <map>
 
 #include "ash/shell.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/widget/widget.h"
diff --git a/ash/utility/partial_screenshot_controller.h b/ash/utility/partial_screenshot_controller.h
index abe123b..8ea678e 100644
--- a/ash/utility/partial_screenshot_controller.h
+++ b/ash/utility/partial_screenshot_controller.h
@@ -5,10 +5,13 @@
 #ifndef ASH_UTILITY_PARTIAL_SCREENSHOT_CONTROLLER_H_
 #define ASH_UTILITY_PARTIAL_SCREENSHOT_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include <map>
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/display_observer.h"
diff --git a/ash/virtual_keyboard_controller.h b/ash/virtual_keyboard_controller.h
index 83b9fce..b43fc2e 100644
--- a/ash/virtual_keyboard_controller.h
+++ b/ash/virtual_keyboard_controller.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
+#include "base/macros.h"
 #include "ui/events/devices/input_device_event_observer.h"
 
 namespace ash {
diff --git a/ash/wm/always_on_top_controller.h b/ash/wm/always_on_top_controller.h
index 0d26c51..47dcbc5 100644
--- a/ash/wm/always_on_top_controller.h
+++ b/ash/wm/always_on_top_controller.h
@@ -6,8 +6,8 @@
 #define ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/aura/window_observer.h"
 
 namespace aura {
diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h
index 2226ba4..3364b11 100644
--- a/ash/wm/app_list_controller.h
+++ b/ash/wm/app_list_controller.h
@@ -7,8 +7,8 @@
 
 #include "ash/shelf/shelf_icon_observer.h"
 #include "ash/shell_observer.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/app_list/pagination_model_observer.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/ash_focus_rules.h b/ash/wm/ash_focus_rules.h
index 57cf98a..c7430e8 100644
--- a/ash/wm/ash_focus_rules.h
+++ b/ash/wm/ash_focus_rules.h
@@ -6,8 +6,8 @@
 #define ASH_WM_ASH_FOCUS_RULES_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/wm/core/base_focus_rules.h"
 
 namespace ash {
diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h
index 3278e43..2c2c506 100644
--- a/ash/wm/ash_native_cursor_manager.h
+++ b/ash/wm/ash_native_cursor_manager.h
@@ -6,8 +6,8 @@
 #define ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/geometry/point.h"
diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
index ba52bbd..7778c32 100644
--- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
+++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
@@ -25,7 +25,7 @@ using AshNativeCursorManagerTest = test::AshInteractiveUITestBase;
 
 namespace {
 
-DisplayInfo CreateDisplayInfo(int64 id,
+DisplayInfo CreateDisplayInfo(int64_t id,
                               const gfx::Rect& bounds,
                               float device_scale_factor) {
   DisplayInfo info(id, "", false);
diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc
index abb22c9..5a244af 100644
--- a/ash/wm/ash_native_cursor_manager_unittest.cc
+++ b/ash/wm/ash_native_cursor_manager_unittest.cc
@@ -159,7 +159,7 @@ TEST_F(AshNativeCursorManagerTest, FractionalScale) {
 #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();
diff --git a/ash/wm/boot_splash_screen_chromeos.h b/ash/wm/boot_splash_screen_chromeos.h
index a127a51..d1704cb 100644
--- a/ash/wm/boot_splash_screen_chromeos.h
+++ b/ash/wm/boot_splash_screen_chromeos.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
diff --git a/ash/wm/cursor_manager_chromeos.h b/ash/wm/cursor_manager_chromeos.h
index 70c121e..e1b4515 100644
--- a/ash/wm/cursor_manager_chromeos.h
+++ b/ash/wm/cursor_manager_chromeos.h
@@ -6,8 +6,8 @@
 #define ASH_WM_CURSOR_MANAGER_CHROMEOS_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
diff --git a/ash/wm/default_state.h b/ash/wm/default_state.h
index f03adb8..1c42b16 100644
--- a/ash/wm/default_state.h
+++ b/ash/wm/default_state.h
@@ -6,6 +6,7 @@
 #define ASH_WM_DEFAULT_STATE_H_
 
 #include "ash/wm/window_state.h"
+#include "base/macros.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
diff --git a/ash/wm/default_window_resizer.h b/ash/wm/default_window_resizer.h
index 3f7537e..fbf75ec 100644
--- a/ash/wm/default_window_resizer.h
+++ b/ash/wm/default_window_resizer.h
@@ -7,6 +7,7 @@
 
 #include "ash/wm/window_resizer.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h
index 03af95d..4de7b80 100644
--- a/ash/wm/dock/docked_window_layout_manager.h
+++ b/ash/wm/dock/docked_window_layout_manager.h
@@ -12,8 +12,8 @@
 #include "ash/wm/dock/dock_types.h"
 #include "ash/wm/dock/docked_window_layout_manager_observer.h"
 #include "ash/wm/window_state_observer.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
index e688913..9f007211 100644
--- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
+++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -23,7 +23,6 @@
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/aura_constants.h"
diff --git a/ash/wm/dock/docked_window_resizer.h b/ash/wm/dock/docked_window_resizer.h
index 6b769d3..4d5dbde 100644
--- a/ash/wm/dock/docked_window_resizer.h
+++ b/ash/wm/dock/docked_window_resizer.h
@@ -8,6 +8,7 @@
 #include "ash/wm/dock/dock_types.h"
 #include "ash/wm/window_resizer.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 
diff --git a/ash/wm/drag_details.h b/ash/wm/drag_details.h
index 5fe0c6a..bfa3923 100644
--- a/ash/wm/drag_details.h
+++ b/ash/wm/drag_details.h
@@ -7,7 +7,6 @@
 
 #include "ash/ash_export.h"
 #include "ash/wm/wm_types.h"
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/wm/public/window_move_client.h"
diff --git a/ash/wm/drag_window_controller.h b/ash/wm/drag_window_controller.h
index 2a158c0..a78733b 100644
--- a/ash/wm/drag_window_controller.h
+++ b/ash/wm/drag_window_controller.h
@@ -6,8 +6,8 @@
 #define ASH_WM_DRAG_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h
index 11d1544b..04bb62e 100644
--- a/ash/wm/drag_window_resizer.h
+++ b/ash/wm/drag_window_resizer.h
@@ -8,6 +8,7 @@
 #include "ash/wm/window_resizer.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/gfx/geometry/point.h"
diff --git a/ash/wm/event_client_impl.h b/ash/wm/event_client_impl.h
index 8a7a488..1fa176e 100644
--- a/ash/wm/event_client_impl.h
+++ b/ash/wm/event_client_impl.h
@@ -6,8 +6,8 @@
 #define ASH_WM_EVENT_CLIENT_IMPL_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/aura/client/event_client.h"
 
 namespace ash {
diff --git a/ash/wm/gestures/long_press_affordance_handler.h b/ash/wm/gestures/long_press_affordance_handler.h
index 1ba1793..2ab4032 100644
--- a/ash/wm/gestures/long_press_affordance_handler.h
+++ b/ash/wm/gestures/long_press_affordance_handler.h
@@ -5,6 +5,7 @@
 #ifndef ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_
 #define ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_
 
+#include "base/macros.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/animation/linear_animation.h"
diff --git a/ash/wm/gestures/overview_gesture_handler.h b/ash/wm/gestures/overview_gesture_handler.h
index 32488f2..98d986d 100644
--- a/ash/wm/gestures/overview_gesture_handler.h
+++ b/ash/wm/gestures/overview_gesture_handler.h
@@ -5,7 +5,7 @@
 #ifndef ASH_WM_GESTURES_OVERVIEW_GESTURE_HANDLER_H_
 #define ASH_WM_GESTURES_OVERVIEW_GESTURE_HANDLER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
diff --git a/ash/wm/gestures/shelf_gesture_handler.h b/ash/wm/gestures/shelf_gesture_handler.h
index bbcef28..19b5409 100644
--- a/ash/wm/gestures/shelf_gesture_handler.h
+++ b/ash/wm/gestures/shelf_gesture_handler.h
@@ -5,7 +5,7 @@
 #ifndef ASH_WM_GESTURES_SHELF_GESTURE_HANDLER_H_
 #define ASH_WM_GESTURES_SHELF_GESTURE_HANDLER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace aura {
diff --git a/ash/wm/immersive_fullscreen_controller.h b/ash/wm/immersive_fullscreen_controller.h
index 7352bf0..8b3f141 100644
--- a/ash/wm/immersive_fullscreen_controller.h
+++ b/ash/wm/immersive_fullscreen_controller.h
@@ -9,6 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/wm/immersive_revealed_lock.h"
+#include "base/macros.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/events/event_handler.h"
diff --git a/ash/wm/immersive_revealed_lock.h b/ash/wm/immersive_revealed_lock.h
index a7dbea5..49568c6 100644
--- a/ash/wm/immersive_revealed_lock.h
+++ b/ash/wm/immersive_revealed_lock.h
@@ -6,7 +6,7 @@
 #define ASH_WM_IMMERSIVE_REVEALED_LOCK_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 
 namespace ash {
diff --git a/ash/wm/lock_layout_manager.h b/ash/wm/lock_layout_manager.h
index ec79434..b9888a9 100644
--- a/ash/wm/lock_layout_manager.h
+++ b/ash/wm/lock_layout_manager.h
@@ -9,8 +9,8 @@
 #include "ash/shell_delegate.h"
 #include "ash/snap_to_pixel_layout_manager.h"
 #include "ash/wm/wm_types.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc
index 944124c..5439a72 100644
--- a/ash/wm/lock_layout_manager_unittest.cc
+++ b/ash/wm/lock_layout_manager_unittest.cc
@@ -9,7 +9,6 @@
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
index 496c9e0..abe91af 100644
--- a/ash/wm/lock_state_controller.h
+++ b/ash/wm/lock_state_controller.h
@@ -9,7 +9,7 @@
 #include "ash/shell_observer.h"
 #include "ash/wm/lock_state_observer.h"
 #include "ash/wm/session_state_animator.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
diff --git a/ash/wm/lock_window_state.h b/ash/wm/lock_window_state.h
index 33a5b0b..71de81b 100644
--- a/ash/wm/lock_window_state.h
+++ b/ash/wm/lock_window_state.h
@@ -6,6 +6,7 @@
 #define ASH_WM_LOCK_WINDOW_STATE_H_
 
 #include "ash/wm/window_state.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
index fb6a389..fe94cc0 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -447,7 +447,7 @@ TEST_F(MaximizeModeControllerTest, DisplayDisconnectionDuringOverview) {
 TEST_F(MaximizeModeControllerTest, NoMaximizeModeWithDisabledInternalDisplay) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   UpdateDisplay("200x200, 200x200");
-  const int64 internal_display_id =
+  const int64_t internal_display_id =
       test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
   ASSERT_FALSE(IsMaximizeModeStarted());
 
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.h b/ash/wm/maximize_mode/maximize_mode_window_manager.h
index be64c6d..49adced 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager.h
+++ b/ash/wm/maximize_mode/maximize_mode_window_manager.h
@@ -5,14 +5,16 @@
 #ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
 #define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/window_state.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/display_observer.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.h b/ash/wm/maximize_mode/maximize_mode_window_state.h
index b562768..4dc9386 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.h
+++ b/ash/wm/maximize_mode/maximize_mode_window_state.h
@@ -6,6 +6,7 @@
 #define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
 
 #include "ash/wm/window_state.h"
+#include "base/macros.h"
 
 namespace ash {
 class MaximizeModeWindowManager;
diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.h b/ash/wm/maximize_mode/workspace_backdrop_delegate.h
index 0a31c33..0593a92 100644
--- a/ash/wm/maximize_mode/workspace_backdrop_delegate.h
+++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/wm/workspace/workspace_layout_manager_delegate.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/aura/window_observer.h"
 
 namespace aura {
diff --git a/ash/wm/mru_window_tracker.h b/ash/wm/mru_window_tracker.h
index 06673a8..9541f2e 100644
--- a/ash/wm/mru_window_tracker.h
+++ b/ash/wm/mru_window_tracker.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
diff --git a/ash/wm/overlay_event_filter.h b/ash/wm/overlay_event_filter.h
index 535b68b..eae35a2 100644
--- a/ash/wm/overlay_event_filter.h
+++ b/ash/wm/overlay_event_filter.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/aura/window.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/wm/overview/scoped_transform_overview_window.h b/ash/wm/overview/scoped_transform_overview_window.h
index 8a2dec7..9522476 100644
--- a/ash/wm/overview/scoped_transform_overview_window.h
+++ b/ash/wm/overview/scoped_transform_overview_window.h
@@ -7,6 +7,7 @@
 
 #include "ash/wm/overview/scoped_overview_animation_settings.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc
index 83ae20a..713c7cb 100644
--- a/ash/wm/overview/window_grid.cc
+++ b/ash/wm/overview/window_grid.cc
@@ -185,12 +185,14 @@ void ReorderItemsGreedyLeastMovement(std::vector<aura::Window*>* items,
         bounding_rect.y() + row * item_size.height() + item_size.height() / 2);
     // Find the nearest window for this position.
     size_t swap_index = i;
-    int64 shortest_distance = std::numeric_limits<int64>::max();
+    int64_t shortest_distance = std::numeric_limits<int64_t>::max();
     for (size_t j = i; j < items->size(); ++j) {
       aura::Window* window = (*items)[j];
-      int64 distance = (ScreenUtil::ConvertRectToScreen(
-                            window, window->GetTargetBounds()).CenterPoint() -
-                        overview_item_center).LengthSquared();
+      int64_t distance =
+          (ScreenUtil::ConvertRectToScreen(window, window->GetTargetBounds())
+               .CenterPoint() -
+           overview_item_center)
+              .LengthSquared();
       // We compare raw pointers to create a stable ordering given two windows
       // with the same center point.
       if (distance < shortest_distance ||
diff --git a/ash/wm/overview/window_grid.h b/ash/wm/overview/window_grid.h
index 349c366..2865be8 100644
--- a/ash/wm/overview/window_grid.h
+++ b/ash/wm/overview/window_grid.h
@@ -5,6 +5,8 @@
 #ifndef ASH_WM_OVERVIEW_WINDOW_GRID_H_
 #define ASH_WM_OVERVIEW_WINDOW_GRID_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <vector>
 
diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h
index c02abf8..9024b2d 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/wm/overview/window_selector.h
@@ -5,11 +5,15 @@
 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
diff --git a/ash/wm/overview/window_selector_controller.h b/ash/wm/overview/window_selector_controller.h
index 8d4a625..3cef13f 100644
--- a/ash/wm/overview/window_selector_controller.h
+++ b/ash/wm/overview/window_selector_controller.h
@@ -11,7 +11,7 @@
 #include "ash/ash_export.h"
 #include "ash/wm/overview/window_selector.h"
 #include "ash/wm/overview/window_selector_delegate.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/overview/window_selector_item.h b/ash/wm/overview/window_selector_item.h
index 40063a3..d7949d9 100644
--- a/ash/wm/overview/window_selector_item.h
+++ b/ash/wm/overview/window_selector_item.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/scoped_window_targeter.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 01fdf63..cddcf65 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -30,7 +30,6 @@
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
diff --git a/ash/wm/panels/attached_panel_window_targeter.h b/ash/wm/panels/attached_panel_window_targeter.h
index 123b4dc..ac715cc 100644
--- a/ash/wm/panels/attached_panel_window_targeter.h
+++ b/ash/wm/panels/attached_panel_window_targeter.h
@@ -6,6 +6,7 @@
 #define ASH_WM_PANELS_ATTACHED_PANEL_WINDOW_TARGETER_H_
 
 #include "ash/shell_observer.h"
+#include "base/macros.h"
 #include "ui/wm/core/easy_resize_window_targeter.h"
 
 namespace ash {
diff --git a/ash/wm/panels/panel_frame_view.h b/ash/wm/panels/panel_frame_view.h
index d51a72a..0aea4b8 100644
--- a/ash/wm/panels/panel_frame_view.h
+++ b/ash/wm/panels/panel_frame_view.h
@@ -6,7 +6,7 @@
 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace views {
diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h
index 434506a..23dc9d5 100644
--- a/ash/wm/panels/panel_layout_manager.h
+++ b/ash/wm/panels/panel_layout_manager.h
@@ -13,8 +13,8 @@
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/window_state_observer.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/layout_manager.h"
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index e43ecaa..51a0a646 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -25,7 +25,6 @@
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
diff --git a/ash/wm/panels/panel_window_event_handler.h b/ash/wm/panels/panel_window_event_handler.h
index 1c7ce89..3b916b7 100644
--- a/ash/wm/panels/panel_window_event_handler.h
+++ b/ash/wm/panels/panel_window_event_handler.h
@@ -7,6 +7,8 @@
 
 #include "ui/events/event_handler.h"
 
+#include "base/macros.h"
+
 namespace ash {
 
 // PanelWindowEventHandler minimizes panels when the user double clicks or
diff --git a/ash/wm/panels/panel_window_resizer.h b/ash/wm/panels/panel_window_resizer.h
index 63022f5..a183194 100644
--- a/ash/wm/panels/panel_window_resizer.h
+++ b/ash/wm/panels/panel_window_resizer.h
@@ -7,6 +7,7 @@
 
 #include "ash/wm/window_resizer.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 
 namespace gfx {
diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h
index 5d05e52..266f528 100644
--- a/ash/wm/power_button_controller.h
+++ b/ash/wm/power_button_controller.h
@@ -9,7 +9,7 @@
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_export.h"
 #include "ash/wm/session_state_animator.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/wm/resize_handle_window_targeter.h b/ash/wm/resize_handle_window_targeter.h
index 24c2e32..eec6930 100644
--- a/ash/wm/resize_handle_window_targeter.h
+++ b/ash/wm/resize_handle_window_targeter.h
@@ -6,6 +6,7 @@
 #define ASH_WM_RESIZE_HANDLE_WINDOW_TARGETER_H_
 
 #include "ash/wm/window_state_observer.h"
+#include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_targeter.h"
 #include "ui/gfx/geometry/insets.h"
diff --git a/ash/wm/resize_shadow.h b/ash/wm/resize_shadow.h
index 6add50f..4ab6d7b 100644
--- a/ash/wm/resize_shadow.h
+++ b/ash/wm/resize_shadow.h
@@ -5,7 +5,7 @@
 #ifndef ASH_WM_RESIZE_SHADOW_H_
 #define ASH_WM_RESIZE_SHADOW_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace aura {
diff --git a/ash/wm/resize_shadow_controller.h b/ash/wm/resize_shadow_controller.h
index 04afefe..81d9351 100644
--- a/ash/wm/resize_shadow_controller.h
+++ b/ash/wm/resize_shadow_controller.h
@@ -8,8 +8,8 @@
 #include <map>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "ui/aura/window_observer.h"
 
diff --git a/ash/wm/root_window_layout_manager.h b/ash/wm/root_window_layout_manager.h
index 4994469..ede482c 100644
--- a/ash/wm/root_window_layout_manager.h
+++ b/ash/wm/root_window_layout_manager.h
@@ -6,8 +6,8 @@
 #define ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
 
 #include "ash/shell_window_ids.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/layout_manager.h"
 
diff --git a/ash/wm/screen_dimmer.h b/ash/wm/screen_dimmer.h
index 9d8779e..95a9814f 100644
--- a/ash/wm/screen_dimmer.h
+++ b/ash/wm/screen_dimmer.h
@@ -7,8 +7,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window_observer.h"
 
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc
index 084105e..65c2914 100644
--- a/ash/wm/screen_dimmer_unittest.cc
+++ b/ash/wm/screen_dimmer_unittest.cc
@@ -8,7 +8,6 @@
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/dim_window.h"
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 //#include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/test/test_windows.h"
diff --git a/ash/wm/session_state_animator.h b/ash/wm/session_state_animator.h
index b293b47..29f1aed 100644
--- a/ash/wm/session_state_animator.h
+++ b/ash/wm/session_state_animator.h
@@ -6,8 +6,8 @@
 #define ASH_WM_SESSION_STATE_ANIMATOR_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 
 namespace ash {
diff --git a/ash/wm/session_state_animator_impl.h b/ash/wm/session_state_animator_impl.h
index 6c634bd..cc55ee4 100644
--- a/ash/wm/session_state_animator_impl.h
+++ b/ash/wm/session_state_animator_impl.h
@@ -7,7 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/wm/session_state_animator.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/aura/window.h"
 
 namespace ui {
diff --git a/ash/wm/stacking_controller.h b/ash/wm/stacking_controller.h
index 48ffc96..423b88c 100644
--- a/ash/wm/stacking_controller.h
+++ b/ash/wm/stacking_controller.h
@@ -6,8 +6,8 @@
 #define ASH_WM_STACKING_CONTROLLER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/window_tree_client.h"
 
diff --git a/ash/wm/status_area_layout_manager.h b/ash/wm/status_area_layout_manager.h
index 23ec882..77a844d 100644
--- a/ash/wm/status_area_layout_manager.h
+++ b/ash/wm/status_area_layout_manager.h
@@ -6,8 +6,8 @@
 #define ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
 
 #include "ash/snap_to_pixel_layout_manager.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/aura/layout_manager.h"
 
 namespace ash {
diff --git a/ash/wm/system_background_controller.h b/ash/wm/system_background_controller.h
index c695cbd..4530302 100644
--- a/ash/wm/system_background_controller.h
+++ b/ash/wm/system_background_controller.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/system_gesture_event_filter.h b/ash/wm/system_gesture_event_filter.h
index 421836b..825b383 100644
--- a/ash/wm/system_gesture_event_filter.h
+++ b/ash/wm/system_gesture_event_filter.h
@@ -5,6 +5,7 @@
 #ifndef ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_
 #define ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/wm/system_modal_container_event_filter.h b/ash/wm/system_modal_container_event_filter.h
index 6be8f05..e98e7e0 100644
--- a/ash/wm/system_modal_container_event_filter.h
+++ b/ash/wm/system_modal_container_event_filter.h
@@ -6,8 +6,8 @@
 #define ASH_WM_SYSTEM_MODAL_CONTAINER_EVENT_FILTER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 
 namespace ash {
diff --git a/ash/wm/system_modal_container_layout_manager.h b/ash/wm/system_modal_container_layout_manager.h
index 5818708..1698d15 100644
--- a/ash/wm/system_modal_container_layout_manager.h
+++ b/ash/wm/system_modal_container_layout_manager.h
@@ -9,8 +9,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/snap_to_pixel_layout_manager.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window_observer.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h
index 80ce0f8..aa12f28 100644
--- a/ash/wm/toplevel_window_event_handler.h
+++ b/ash/wm/toplevel_window_event_handler.h
@@ -12,6 +12,7 @@
 #include "ash/wm/wm_types.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/geometry/point.h"
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc
index c2d708f..0322dde 100644
--- a/ash/wm/toplevel_window_event_handler_unittest.cc
+++ b/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -13,7 +13,6 @@
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h
index ca1a3e5..61a9e23 100644
--- a/ash/wm/video_detector.h
+++ b/ash/wm/video_detector.h
@@ -9,8 +9,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
diff --git a/ash/wm/video_detector_unittest.cc b/ash/wm/video_detector_unittest.cc
index edc0544..2ee7a0cd 100644
--- a/ash/wm/video_detector_unittest.cc
+++ b/ash/wm/video_detector_unittest.cc
@@ -266,7 +266,7 @@ TEST_F(VideoDetectorTest, RepeatedNotifications) {
   // Let enough time pass that a second notification should be sent.
   observer_->reset_stats();
   AdvanceTime(base::TimeDelta::FromSeconds(
-      static_cast<int64>(VideoDetector::kNotifyIntervalSec + 1)));
+      static_cast<int64_t>(VideoDetector::kNotifyIntervalSec + 1)));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnDelegatedFrameDamage(window.get(), update_region);
   EXPECT_EQ(1, observer_->num_invocations());
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 277f537..93af37a 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -62,8 +62,8 @@ const float kWindowAnimation_ShowOpacity = 1.f;
 const float kLayerScaleAboveSize = 1.1f;
 const float kLayerScaleBelowSize = .9f;
 
-int64 Round64(float f) {
-  return static_cast<int64>(f + 0.5f);
+int64_t Round64(float f) {
+  return static_cast<int64_t>(f + 0.5f);
 }
 
 base::TimeDelta GetCrossFadeDuration(aura::Window* window,
diff --git a/ash/wm/window_cycle_controller.h b/ash/wm/window_cycle_controller.h
index 8cfd2a5..888785e 100644
--- a/ash/wm/window_cycle_controller.h
+++ b/ash/wm/window_cycle_controller.h
@@ -6,7 +6,7 @@
 #define ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
diff --git a/ash/wm/window_cycle_list.h b/ash/wm/window_cycle_list.h
index 1318c42..70be5bc 100644
--- a/ash/wm/window_cycle_list.h
+++ b/ash/wm/window_cycle_list.h
@@ -9,8 +9,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/wm/window_cycle_controller.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window_observer.h"
 
diff --git a/ash/wm/window_positioner.h b/ash/wm/window_positioner.h
index cba3a0c..ad66a7b 100644
--- a/ash/wm/window_positioner.h
+++ b/ash/wm/window_positioner.h
@@ -6,7 +6,7 @@
 #define ASH_WM_WINDOW_POSITIONER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/ash/wm/window_resizer.h b/ash/wm/window_resizer.h
index c669886..a50fcdc 100644
--- a/ash/wm/window_resizer.h
+++ b/ash/wm/window_resizer.h
@@ -8,7 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/wm/drag_details.h"
 #include "ash/wm/window_state.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/wm/public/window_move_client.h"
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h
index b3f49f5..c17dc0d 100644
--- a/ash/wm/window_state.h
+++ b/ash/wm/window_state.h
@@ -8,8 +8,8 @@
 #include "ash/ash_export.h"
 #include "ash/wm/drag_details.h"
 #include "ash/wm/wm_types.h"
-#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/window_state_delegate.h b/ash/wm/window_state_delegate.h
index f3480c3..7912efe 100644
--- a/ash/wm/window_state_delegate.h
+++ b/ash/wm/window_state_delegate.h
@@ -6,7 +6,7 @@
 #define ASH_WM_WINDOW_STATE_DELEGATE_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace ash {
 namespace wm {
diff --git a/ash/wm/wm_event.h b/ash/wm/wm_event.h
index 6630026..fd5c249 100644
--- a/ash/wm/wm_event.h
+++ b/ash/wm/wm_event.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/wm/wm_types.h"
+#include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
diff --git a/ash/wm/wm_types.cc b/ash/wm/wm_types.cc
index fe04b95..6677faf 100644
--- a/ash/wm/wm_types.cc
+++ b/ash/wm/wm_types.cc
@@ -4,7 +4,6 @@
 
 #include "ash/wm/wm_types.h"
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 
 namespace ash {
diff --git a/ash/wm/workspace/magnetism_matcher.cc b/ash/wm/workspace/magnetism_matcher.cc
index d486f61..18e20cb 100644
--- a/ash/wm/workspace/magnetism_matcher.cc
+++ b/ash/wm/workspace/magnetism_matcher.cc
@@ -20,7 +20,7 @@ bool IsCloseEnough(int a, int b) {
 // MagnetismEdges.
 bool CanMatchSecondaryEdge(MagnetismEdge primary,
                            SecondaryMagnetismEdge secondary,
-                           uint32 edges) {
+                           uint32_t edges) {
   // Convert |secondary| to a MagnetismEdge so we can compare it to |edges|.
   MagnetismEdge secondary_as_magnetism_edge = MAGNETISM_EDGE_TOP;
   switch (primary) {
@@ -120,7 +120,7 @@ void MagnetismEdgeMatcher::UpdateRanges(const Range& range) {
 // static
 const int MagnetismMatcher::kMagneticDistance = 8;
 
-MagnetismMatcher::MagnetismMatcher(const gfx::Rect& bounds, uint32 edges)
+MagnetismMatcher::MagnetismMatcher(const gfx::Rect& bounds, uint32_t edges)
     : edges_(edges) {
   if (edges & MAGNETISM_EDGE_TOP)
     matchers_.push_back(new MagnetismEdgeMatcher(bounds, MAGNETISM_EDGE_TOP));
diff --git a/ash/wm/workspace/magnetism_matcher.h b/ash/wm/workspace/magnetism_matcher.h
index 141303d..b694eaa 100644
--- a/ash/wm/workspace/magnetism_matcher.h
+++ b/ash/wm/workspace/magnetism_matcher.h
@@ -5,12 +5,15 @@
 #ifndef ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_
 #define ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_
 
+#include <stdint.h>
+
 #include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -23,9 +26,9 @@ enum MagnetismEdge {
   MAGNETISM_EDGE_RIGHT  = 1 << 3,
 };
 
-const uint32 kAllMagnetismEdges =
-    MAGNETISM_EDGE_TOP | MAGNETISM_EDGE_LEFT | MAGNETISM_EDGE_BOTTOM |
-    MAGNETISM_EDGE_RIGHT;
+const uint32_t kAllMagnetismEdges = MAGNETISM_EDGE_TOP | MAGNETISM_EDGE_LEFT |
+                                    MAGNETISM_EDGE_BOTTOM |
+                                    MAGNETISM_EDGE_RIGHT;
 
 // MagnetismEdgeMatcher is used for matching a particular edge of a window. You
 // shouldn't need to use this directly, instead use MagnetismMatcher which takes
@@ -159,7 +162,7 @@ class ASH_EXPORT MagnetismMatcher {
   static const int kMagneticDistance;
 
   // |edges| is a bitmask of MagnetismEdges to match against.
-  MagnetismMatcher(const gfx::Rect& bounds, uint32 edges);
+  MagnetismMatcher(const gfx::Rect& bounds, uint32_t edges);
   ~MagnetismMatcher();
 
   // Returns true if |bounds| is close enough to the initial bounds that the two
@@ -177,7 +180,7 @@ class ASH_EXPORT MagnetismMatcher {
                              SecondaryMagnetismEdge* secondary_edge) const;
 
   // The edges to match against.
-  const int32 edges_;
+  const int32_t edges_;
 
   ScopedVector<MagnetismEdgeMatcher> matchers_;
 
diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h
index 3a76f74..73cb0b8 100644
--- a/ash/wm/workspace/multi_window_resize_controller.h
+++ b/ash/wm/workspace/multi_window_resize_controller.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/workspace/phantom_window_controller.h b/ash/wm/workspace/phantom_window_controller.h
index 717366d..c25069f 100644
--- a/ash/wm/workspace/phantom_window_controller.h
+++ b/ash/wm/workspace/phantom_window_controller.h
@@ -6,7 +6,7 @@
 #define ASH_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/ash/wm/workspace/two_step_edge_cycler.h b/ash/wm/workspace/two_step_edge_cycler.h
index 3254cfd..d6aca87 100644
--- a/ash/wm/workspace/two_step_edge_cycler.h
+++ b/ash/wm/workspace/two_step_edge_cycler.h
@@ -6,7 +6,7 @@
 #define ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/gfx/geometry/point.h"
 
diff --git a/ash/wm/workspace/workspace_event_handler.h b/ash/wm/workspace/workspace_event_handler.h
index de12aa4..cc72aec 100644
--- a/ash/wm/workspace/workspace_event_handler.h
+++ b/ash/wm/workspace/workspace_event_handler.h
@@ -6,6 +6,7 @@
 #define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
 
 #include "ash/wm/workspace/multi_window_resize_controller.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 
 namespace ash {
diff --git a/ash/wm/workspace/workspace_event_handler_test_helper.h b/ash/wm/workspace/workspace_event_handler_test_helper.h
index 3d0ec95..013d0d0 100644
--- a/ash/wm/workspace/workspace_event_handler_test_helper.h
+++ b/ash/wm/workspace/workspace_event_handler_test_helper.h
@@ -7,6 +7,8 @@
 
 #include "ash/wm/workspace/workspace_event_handler.h"
 
+#include "base/macros.h"
+
 namespace ash {
 
 class WorkspaceEventHandlerTestHelper {
diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h
index 06cc9b9..d08a079 100644
--- a/ash/wm/workspace/workspace_layout_manager.h
+++ b/ash/wm/workspace/workspace_layout_manager.h
@@ -11,8 +11,8 @@
 #include "ash/shell_observer.h"
 #include "ash/wm/window_state_observer.h"
 #include "ash/wm/wm_types.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 2a3157e..9d26de5 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -21,7 +21,6 @@
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_windows.h"
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
index 2c08207..a4adbf7 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -224,7 +224,7 @@ gfx::Rect BoundsForMagneticResizeAttach(const gfx::Rect& src,
 }
 
 // Converts a window component edge to the magnetic edge to snap to.
-uint32 WindowComponentToMagneticEdge(int window_component) {
+uint32_t WindowComponentToMagneticEdge(int window_component) {
   switch (window_component) {
     case HTTOPLEFT:
       return MAGNETISM_EDGE_LEFT | MAGNETISM_EDGE_TOP;
@@ -717,8 +717,8 @@ void WorkspaceWindowResizer::MagneticallySnapToOtherWindows(gfx::Rect* bounds) {
 
 void WorkspaceWindowResizer::MagneticallySnapResizeToOtherWindows(
     gfx::Rect* bounds) {
-  const uint32 edges = WindowComponentToMagneticEdge(
-      details().window_component);
+  const uint32_t edges =
+      WindowComponentToMagneticEdge(details().window_component);
   if (UpdateMagnetismWindow(*bounds, edges)) {
     *bounds = ScreenUtil::ConvertRectFromScreen(
         GetTarget()->parent(),
@@ -730,7 +730,7 @@ void WorkspaceWindowResizer::MagneticallySnapResizeToOtherWindows(
 }
 
 bool WorkspaceWindowResizer::UpdateMagnetismWindow(const gfx::Rect& bounds,
-                                                   uint32 edges) {
+                                                   uint32_t edges) {
   // |bounds| are in coordinates of original window's parent.
   gfx::Rect bounds_in_screen =
       ScreenUtil::ConvertRectToScreen(GetTarget()->parent(), bounds);
@@ -865,8 +865,8 @@ void WorkspaceWindowResizer::StickToWorkAreaOnResize(
     const gfx::Rect& work_area,
     int sticky_size,
     gfx::Rect* bounds) const {
-  const uint32 edges = WindowComponentToMagneticEdge(
-      details().window_component);
+  const uint32_t edges =
+      WindowComponentToMagneticEdge(details().window_component);
   const int left_edge = work_area.x();
   const int right_edge = work_area.right();
   const int top_edge = work_area.y();
diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h
index 7a80566..8ee77f7 100644
--- a/ash/wm/workspace/workspace_window_resizer.h
+++ b/ash/wm/workspace/workspace_window_resizer.h
@@ -5,11 +5,14 @@
 #ifndef ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
 #define ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/workspace/magnetism_matcher.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/window_tracker.h"
@@ -112,7 +115,7 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
   // |magnetism_window_| and |magnetism_edge_| appropriately. |edges| is a
   // bitmask of the MagnetismEdges to match again. Returns true if a match is
   // found.
-  bool UpdateMagnetismWindow(const gfx::Rect& bounds, uint32 edges);
+  bool UpdateMagnetismWindow(const gfx::Rect& bounds, uint32_t edges);
 
   // Adjusts the bounds of the window: magnetically snapping, ensuring the
   // window has enough on screen... |snap_size| is the distance from an edge of
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index c43f9cc..f22b2ea 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -7,7 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/wm/workspace/workspace_types.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace aura {
diff --git a/ash/wm/workspace_controller_test_helper.h b/ash/wm/workspace_controller_test_helper.h
index f020c35..a5aeb44 100644
--- a/ash/wm/workspace_controller_test_helper.h
+++ b/ash/wm/workspace_controller_test_helper.h
@@ -6,6 +6,7 @@
 #define ASH_WM_WORKSPACE_CONTROLLER_TEST_HELPER_H_
 
 #include "ash/wm/workspace_controller.h"
+#include "base/macros.h"
 
 namespace ash {
 class MultiWindowResizeController;