Use a direct include of time headers in android_webview/, apps/, ash/.

BUG=254986
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/18050008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209025 0039d316-1c4b-4281-b951-d872f2087c98

55 files changed, 71 insertions, 71 deletions

diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc
index f32d091..a1cb53e 100644
--- a/ash/accelerators/exit_warning_handler.cc
+++ b/ash/accelerators/exit_warning_handler.cc
@@ -8,8 +8,8 @@
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/accessibility/accessible_view_state.h"
diff --git a/ash/accelerators/exit_warning_handler.h b/ash/accelerators/exit_warning_handler.h
index 832a3ed..b303d84 100644
--- a/ash/accelerators/exit_warning_handler.h
+++ b/ash/accelerators/exit_warning_handler.h
@@ -6,7 +6,7 @@
 #define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
 
 #include "ash/ash_export.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace views {
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index 241d841..1caff13 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -44,7 +44,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #if defined(USE_X11)
 #include "ash/display/output_configurator_animation.h"
 #include "chromeos/display/output_configurator.h"
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index b23d72a..bfe86ff 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -14,9 +14,9 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "base/time.h"
-#include "ui/gfx/display_observer.h"
+#include "base/time/time.h"
 #include "ui/gfx/display.h"
+#include "ui/gfx/display_observer.h"
 
 namespace aura {
 class Display;
diff --git a/ash/display/output_configurator_animation.cc b/ash/display/output_configurator_animation.cc
index 0b57aca..d58d9a5 100644
--- a/ash/display/output_configurator_animation.cc
+++ b/ash/display/output_configurator_animation.cc
@@ -9,7 +9,7 @@
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
diff --git a/ash/display/output_configurator_animation.h b/ash/display/output_configurator_animation.h
index dc70264..3fefe92 100644
--- a/ash/display/output_configurator_animation.h
+++ b/ash/display/output_configurator_animation.h
@@ -9,7 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "base/callback.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "chromeos/display/output_configurator.h"
 
 namespace aura {
diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc
index 1ed63d5..8fbcc6a 100644
--- a/ash/launcher/launcher_tooltip_manager.cc
+++ b/ash/launcher/launcher_tooltip_manager.cc
@@ -11,8 +11,8 @@
 #include "ash/wm/window_animations.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc
index 206fc0f..5df58a6 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -12,7 +12,7 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/string16.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_constants.h"
diff --git a/ash/launcher/tabbed_launcher_button.h b/ash/launcher/tabbed_launcher_button.h
index 6eb0b9e..0ac2c3b 100644
--- a/ash/launcher/tabbed_launcher_button.h
+++ b/ash/launcher/tabbed_launcher_button.h
@@ -7,7 +7,7 @@
 
 #include "ash/launcher/launcher_button.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/glow_hover_controller.h"
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 04f41cd..143f0ea 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -40,7 +40,7 @@
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/command_line.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/tooltip_client.h"
 #include "ui/aura/root_window.h"
diff --git a/ash/rotator/screen_rotation.cc b/ash/rotator/screen_rotation.cc
index 2f0dc850..248394a 100644
--- a/ash/rotator/screen_rotation.cc
+++ b/ash/rotator/screen_rotation.cc
@@ -4,7 +4,7 @@
 
 #include "ash/rotator/screen_rotation.h"
 
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/rect.h"
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 2bd9141..f113675 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -17,7 +17,7 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/observer_list.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/gfx/insets.h"
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index 4bfe453..5a260a5 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -17,7 +17,7 @@
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 8660c2f..0e7fcb4 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -12,7 +12,7 @@
 #include "ash/shell.h"
 #include "base/callback.h"
 #include "base/strings/string16.h"
-#include "base/time.h"
+#include "base/time/time.h"
 
 namespace app_list {
 class AppListViewDelegate;
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index 5d2e553..8063b1e 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -22,7 +22,7 @@
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_state.h"
diff --git a/ash/system/chromeos/network/network_state_notifier.h b/ash/system/chromeos/network/network_state_notifier.h
index 89d46c3..cfcc4b7 100644
--- a/ash/system/chromeos/network/network_state_notifier.h
+++ b/ash/system/chromeos/network/network_state_notifier.h
@@ -11,7 +11,7 @@
 #include "ash/system/chromeos/network/network_tray_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "chromeos/network/network_state_handler_observer.h"
 
 namespace chromeos {
diff --git a/ash/system/chromeos/network/tray_network.h b/ash/system/chromeos/network/tray_network.h
index 3ba88c4..332db1d 100644
--- a/ash/system/chromeos/network/tray_network.h
+++ b/ash/system/chromeos/network/tray_network.h
@@ -12,7 +12,7 @@
 #include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 
 namespace chromeos {
 class NetworkState;
diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc
index b044897..68789fc 100644
--- a/ash/system/date/date_view.cc
+++ b/ash/system/date/date_view.cc
@@ -10,7 +10,7 @@
 #include "ash/system/tray/tray_utils.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "grit/ash_strings.h"
 #include "third_party/icu/public/i18n/unicode/datefmt.h"
 #include "third_party/icu/public/i18n/unicode/dtptngen.h"
diff --git a/ash/system/date/date_view.h b/ash/system/date/date_view.h
index 6809461..98bc45f 100644
--- a/ash/system/date/date_view.h
+++ b/ash/system/date/date_view.h
@@ -8,7 +8,7 @@
 #include "ash/system/date/tray_date.h"
 #include "ash/system/tray/actionable_view.h"
 #include "base/i18n/time_formatting.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/views/view.h"
 
 namespace views {
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index 0386b3b..0e245a8 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -17,8 +17,8 @@
 #include "base/i18n/time_formatting.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/icu/public/i18n/unicode/datefmt.h"
diff --git a/ash/system/drive/tray_drive.h b/ash/system/drive/tray_drive.h
index 9680c99..6550fde 100644
--- a/ash/system/drive/tray_drive.h
+++ b/ash/system/drive/tray_drive.h
@@ -7,7 +7,7 @@
 
 #include "ash/system/drive/drive_observer.h"
 #include "ash/system/tray/tray_image_item.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 
 namespace views {
 class Label;
diff --git a/ash/system/monitor/tray_monitor.h b/ash/system/monitor/tray_monitor.h
index 4f496c4..cd5734f 100644
--- a/ash/system/monitor/tray_monitor.h
+++ b/ash/system/monitor/tray_monitor.h
@@ -9,7 +9,7 @@
 
 #include "ash/system/tray/system_tray_item.h"
 #include "base/process.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 
 namespace views {
 class Label;
diff --git a/ash/system/session_length_limit/tray_session_length_limit.h b/ash/system/session_length_limit/tray_session_length_limit.h
index 88d601d..1df4bb0 100644
--- a/ash/system/session_length_limit/tray_session_length_limit.h
+++ b/ash/system/session_length_limit/tray_session_length_limit.h
@@ -10,8 +10,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 
 namespace ash {
 namespace internal {
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 7114ece..a766c2e 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -31,7 +31,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/events/event_constants.h"
diff --git a/ash/system/tray/system_tray_bubble.h b/ash/system/tray/system_tray_bubble.h
index 73edaac..61b1543 100644
--- a/ash/system/tray/system_tray_bubble.h
+++ b/ash/system/tray/system_tray_bubble.h
@@ -8,7 +8,7 @@
 #include "ash/system/user/login_status.h"
 #include "base/base_export.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
 #include <vector>
diff --git a/ash/system/tray/test_system_tray_delegate.cc b/ash/system/tray/test_system_tray_delegate.cc
index 18ec7f8..17742ba8 100644
--- a/ash/system/tray/test_system_tray_delegate.cc
+++ b/ash/system/tray/test_system_tray_delegate.cc
@@ -10,7 +10,7 @@
 #include "ash/shell.h"
 #include "ash/volume_control_delegate.h"
 #include "base/message_loop.h"
-#include "base/time.h"
+#include "base/time/time.h"
 
 namespace ash {
 namespace test {
diff --git a/ash/system/tray/tray_notification_view.h b/ash/system/tray/tray_notification_view.h
index 403beca..8723796 100644
--- a/ash/system/tray/tray_notification_view.h
+++ b/ash/system/tray/tray_notification_view.h
@@ -5,7 +5,7 @@
 #ifndef ASH_SYSTEM_TRAY_TRAY_NOTIFICATION_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_NOTIFICATION_VIEWS_H_
 
-#include "base/timer.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_update.cc b/ash/system/tray_update.cc
index e998cc7..e01dd97 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -14,8 +14,8 @@
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/window.h"
diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h
index ac163aa..922cbcc 100644
--- a/ash/wm/app_list_controller.h
+++ b/ash/wm/app_list_controller.h
@@ -9,7 +9,7 @@
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/timer.h"
+#include "base/timer/timer.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/boot_splash_screen.h b/ash/wm/boot_splash_screen.h
index dc4538b..f56f49f 100644
--- a/ash/wm/boot_splash_screen.h
+++ b/ash/wm/boot_splash_screen.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 
 namespace aura {
 class RootWindow;
diff --git a/ash/wm/gestures/long_press_affordance_handler.h b/ash/wm/gestures/long_press_affordance_handler.h
index c21a587..14ff0f3 100644
--- a/ash/wm/gestures/long_press_affordance_handler.h
+++ b/ash/wm/gestures/long_press_affordance_handler.h
@@ -5,7 +5,7 @@
 #ifndef ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_
 #define ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_
 
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/linear_animation.h"
 #include "ui/gfx/point.h"
diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
index a651b5f..10fce26 100644
--- a/ash/wm/lock_state_controller.h
+++ b/ash/wm/lock_state_controller.h
@@ -12,8 +12,8 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "ui/aura/root_window_observer.h"
 
 namespace gfx {
diff --git a/ash/wm/lock_state_controller_impl2.cc b/ash/wm/lock_state_controller_impl2.cc
index fe7152f..c5301b7 100644
--- a/ash/wm/lock_state_controller_impl2.cc
+++ b/ash/wm/lock_state_controller_impl2.cc
@@ -12,7 +12,7 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/wm/lock_state_controller_impl2.h b/ash/wm/lock_state_controller_impl2.h
index 2ea1616..8908a7e 100644
--- a/ash/wm/lock_state_controller_impl2.h
+++ b/ash/wm/lock_state_controller_impl2.h
@@ -11,8 +11,8 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "ui/aura/root_window_observer.h"
 
 namespace gfx {
diff --git a/ash/wm/lock_state_controller_impl2_unittest.cc b/ash/wm/lock_state_controller_impl2_unittest.cc
index 8177422..62bed7c 100644
--- a/ash/wm/lock_state_controller_impl2_unittest.cc
+++ b/ash/wm/lock_state_controller_impl2_unittest.cc
@@ -14,7 +14,7 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/maximize_bubble_controller.cc
index f2e3acb..ae108ca 100644
--- a/ash/wm/maximize_bubble_controller.cc
+++ b/ash/wm/maximize_bubble_controller.cc
@@ -9,7 +9,7 @@
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkPath.h"
diff --git a/ash/wm/power_button_controller_unittest.cc b/ash/wm/power_button_controller_unittest.cc
index 5ee1e27..e1ce71b 100644
--- a/ash/wm/power_button_controller_unittest.cc
+++ b/ash/wm/power_button_controller_unittest.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/power_button_controller.h"
-#include "ash/wm/session_state_animator.h"
-#include "ash/wm/session_state_controller_impl.h"
 #include "ash/ash_switches.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
+#include "ash/wm/lock_state_controller.h"
+#include "ash/wm/power_button_controller.h"
+#include "ash/wm/session_state_animator.h"
+#include "ash/wm/session_state_controller_impl.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
diff --git a/ash/wm/resize_shadow.cc b/ash/wm/resize_shadow.cc
index 27ed2b7..cdf573d 100644
--- a/ash/wm/resize_shadow.cc
+++ b/ash/wm/resize_shadow.cc
@@ -4,7 +4,7 @@
 
 #include "ash/wm/resize_shadow.h"
 
-#include "base/time.h"
+#include "base/time/time.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
diff --git a/ash/wm/screen_dimmer.cc b/ash/wm/screen_dimmer.cc
index 814620a..101d69b 100644
--- a/ash/wm/screen_dimmer.cc
+++ b/ash/wm/screen_dimmer.cc
@@ -5,7 +5,7 @@
 #include "ash/wm/screen_dimmer.h"
 
 #include "ash/shell.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/wm/session_state_animator.h b/ash/wm/session_state_animator.h
index cfd79d5..19ead2f 100644
--- a/ash/wm/session_state_animator.h
+++ b/ash/wm/session_state_animator.h
@@ -9,7 +9,7 @@
 #include "ash/wm/workspace/colored_window_controller.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer_animation_observer.h"
 
diff --git a/ash/wm/session_state_controller_impl.h b/ash/wm/session_state_controller_impl.h
index 79a5c2c..3ffc221 100644
--- a/ash/wm/session_state_controller_impl.h
+++ b/ash/wm/session_state_controller_impl.h
@@ -11,8 +11,8 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "ui/aura/root_window_observer.h"
 
 namespace gfx {
diff --git a/ash/wm/system_gesture_event_filter.h b/ash/wm/system_gesture_event_filter.h
index 182ed5a..8aaabec 100644
--- a/ash/wm/system_gesture_event_filter.h
+++ b/ash/wm/system_gesture_event_filter.h
@@ -7,7 +7,7 @@
 
 #include "ash/shell.h"
 #include "ash/touch/touch_uma.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/linear_animation.h"
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index ce02fad..2238d47 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -20,8 +20,8 @@
 #include "ash/wm/gestures/long_press_affordance_handler.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
diff --git a/ash/wm/user_activity_detector.h b/ash/wm/user_activity_detector.h
index a15b0d4..0a4ad48 100644
--- a/ash/wm/user_activity_detector.h
+++ b/ash/wm/user_activity_detector.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/base/events/event_handler.h"
 
 namespace ash {
diff --git a/ash/wm/user_activity_detector_unittest.cc b/ash/wm/user_activity_detector_unittest.cc
index 66306f7..75af6cc 100644
--- a/ash/wm/user_activity_detector_unittest.cc
+++ b/ash/wm/user_activity_detector_unittest.cc
@@ -9,7 +9,7 @@
 #include "ash/wm/user_activity_observer.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h
index 81fd2da..7a2b112 100644
--- a/ash/wm/video_detector.h
+++ b/ash/wm/video_detector.h
@@ -14,7 +14,7 @@
 #include "base/memory/linked_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/window_observer.h"
 
diff --git a/ash/wm/video_detector_unittest.cc b/ash/wm/video_detector_unittest.cc
index 187742c8d..96e0787 100644
--- a/ash/wm/video_detector_unittest.cc
+++ b/ash/wm/video_detector_unittest.cc
@@ -9,7 +9,7 @@
 #include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_types.h"
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index f490a67..1a64672 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -13,14 +13,14 @@
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/workspace_animations.h"
+#include "ash/wm/workspace_controller.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
index a8646b6..d5680cc 100644
--- a/ash/wm/window_animations_unittest.cc
+++ b/ash/wm/window_animations_unittest.cc
@@ -7,7 +7,7 @@
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/workspace_controller.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/animation_container_element.h"
diff --git a/ash/wm/workspace/desktop_background_fade_controller.cc b/ash/wm/workspace/desktop_background_fade_controller.cc
index 68628b88..563d07b 100644
--- a/ash/wm/workspace/desktop_background_fade_controller.cc
+++ b/ash/wm/workspace/desktop_background_fade_controller.cc
@@ -6,7 +6,7 @@
 
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/colored_window_controller.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/widget/widget.h"
diff --git a/ash/wm/workspace/frame_maximize_button.h b/ash/wm/workspace/frame_maximize_button.h
index 6429aed..f01df6c 100644
--- a/ash/wm/workspace/frame_maximize_button.h
+++ b/ash/wm/workspace/frame_maximize_button.h
@@ -9,7 +9,7 @@
 #include "ash/wm/workspace/maximize_bubble_frame_state.h"
 #include "ash/wm/workspace/snap_types.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/widget_observer.h"
diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h
index 85f7c27..02eeb25 100644
--- a/ash/wm/workspace/multi_window_resize_controller.h
+++ b/ash/wm/workspace/multi_window_resize_controller.h
@@ -10,7 +10,7 @@
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/mouse_watcher.h"
diff --git a/ash/wm/workspace/snap_sizer.h b/ash/wm/workspace/snap_sizer.h
index b283258..bd5f719 100644
--- a/ash/wm/workspace/snap_sizer.h
+++ b/ash/wm/workspace/snap_sizer.h
@@ -9,7 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
diff --git a/ash/wm/workspace/workspace_animations.h b/ash/wm/workspace/workspace_animations.h
index 3e60c1b..39d84a2 100644
--- a/ash/wm/workspace/workspace_animations.h
+++ b/ash/wm/workspace/workspace_animations.h
@@ -6,7 +6,7 @@
 #define ASH_WM_WORKSPACE_WORKSPACE_ANIMATIONS_H_
 
 #include "ash/ash_export.h"
-#include "base/time.h"
+#include "base/time/time.h"
 
 namespace aura {
 class Window;
diff --git a/ash/wm/workspace/workspace_manager.h b/ash/wm/workspace/workspace_manager.h
index 3fca5ec..996666e 100644
--- a/ash/wm/workspace/workspace_manager.h
+++ b/ash/wm/workspace/workspace_manager.h
@@ -15,8 +15,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura {