Use a direct include of time headers in base/, part 2.
BUG=254986
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/18119002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209144 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 8f9a3a50c05caa5a512b190478face70b7918f60
diff --git a/base/pending_task.h b/base/pending_task.h
index 6e4a2dd..65e17f8 100644
--- a/base/pending_task.h
+++ b/base/pending_task.h
@@ -10,7 +10,7 @@
#include "base/base_export.h"
#include "base/callback.h"
#include "base/location.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tracking_info.h"
namespace base {
diff --git a/base/perftimer.h b/base/perftimer.h
index 9a23ff1..466f81d 100644
--- a/base/perftimer.h
+++ b/base/perftimer.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
class FilePath;
diff --git a/base/platform_file.h b/base/platform_file.h
index 1fb29e8..e94c7ed 100644
--- a/base/platform_file.h
+++ b/base/platform_file.h
@@ -15,7 +15,7 @@
#include "base/base_export.h"
#include "base/basictypes.h"
#include "base/files/file_path.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/platform_file_unittest.cc b/base/platform_file_unittest.cc
index 1106f98..0ba7782 100644
--- a/base/platform_file_unittest.cc
+++ b/base/platform_file_unittest.cc
@@ -5,7 +5,7 @@
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/platform_file.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::FilePath;
diff --git a/base/power_monitor/power_monitor.cc b/base/power_monitor/power_monitor.cc
index 13e91c7..87188f1 100644
--- a/base/power_monitor/power_monitor.cc
+++ b/base/power_monitor/power_monitor.cc
@@ -4,7 +4,7 @@
#include "base/power_monitor/power_monitor.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/power_monitor/power_monitor.h b/base/power_monitor/power_monitor.h
index e893547..fc3df48 100644
--- a/base/power_monitor/power_monitor.h
+++ b/base/power_monitor/power_monitor.h
@@ -22,7 +22,7 @@
#endif // !OS_WIN
#if defined(ENABLE_BATTERY_MONITORING)
-#include "base/timer.h"
+#include "base/timer/timer.h"
#endif // defined(ENABLE_BATTERY_MONITORING)
#if defined(OS_IOS)
diff --git a/base/process/process_metrics.h b/base/process/process_metrics.h
index c73bac8..1232f74 100644
--- a/base/process/process_metrics.h
+++ b/base/process/process_metrics.h
@@ -13,7 +13,7 @@
#include "base/base_export.h"
#include "base/basictypes.h"
#include "base/process.h"
-#include "base/time.h"
+#include "base/time/time.h"
#if defined(OS_MACOSX)
#include <mach/mach.h>
diff --git a/base/process_util.h b/base/process_util.h
index 0bec8e0..082017f 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -9,7 +9,7 @@
#define BASE_PROCESS_UTIL_H_
#include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
#if defined(OS_WIN)
#include <windows.h>
diff --git a/base/profiler/tracked_time.cc b/base/profiler/tracked_time.cc
index f1edd6d..27d3358 100644
--- a/base/profiler/tracked_time.cc
+++ b/base/profiler/tracked_time.cc
@@ -55,7 +55,7 @@
// Use lock-free accessor to 32 bit time.
// Note that TimeTicks::Now() is built on this, so we have "compatible"
// times when we down-convert a TimeTicks sample.
- // TODO(jar): Surface this interface via something in base/time.h.
+ // TODO(jar): Surface this interface via something in base/time/time.h.
return TrackedTime(static_cast<int32>(timeGetTime()));
#else
// Posix has nice cheap 64 bit times, so we just down-convert it.
diff --git a/base/profiler/tracked_time.h b/base/profiler/tracked_time.h
index 372c753..2363274 100644
--- a/base/profiler/tracked_time.h
+++ b/base/profiler/tracked_time.h
@@ -8,7 +8,7 @@
#include "base/base_export.h"
#include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace tracked_objects {
diff --git a/base/profiler/tracked_time_unittest.cc b/base/profiler/tracked_time_unittest.cc
index cd7f18c..ef84f15 100644
--- a/base/profiler/tracked_time_unittest.cc
+++ b/base/profiler/tracked_time_unittest.cc
@@ -5,7 +5,7 @@
// Test of classes in tracked_time.cc
#include "base/profiler/tracked_time.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tracked_objects.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/synchronization/cancellation_flag_unittest.cc b/base/synchronization/cancellation_flag_unittest.cc
index 02a31b5..36b8722 100644
--- a/base/synchronization/cancellation_flag_unittest.cc
+++ b/base/synchronization/cancellation_flag_unittest.cc
@@ -10,8 +10,8 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/synchronization/spin_wait.h"
-#include "base/time.h"
#include "base/threading/thread.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
diff --git a/base/synchronization/condition_variable_posix.cc b/base/synchronization/condition_variable_posix.cc
index 25edf16..93b35ed 100644
--- a/base/synchronization/condition_variable_posix.cc
+++ b/base/synchronization/condition_variable_posix.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_restrictions.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/synchronization/condition_variable_unittest.cc b/base/synchronization/condition_variable_unittest.cc
index ee33908..4230e63 100644
--- a/base/synchronization/condition_variable_unittest.cc
+++ b/base/synchronization/condition_variable_unittest.cc
@@ -15,7 +15,7 @@
#include "base/synchronization/spin_wait.h"
#include "base/threading/platform_thread.h"
#include "base/threading/thread_collision_warner.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
diff --git a/base/synchronization/spin_wait.h b/base/synchronization/spin_wait.h
index ad54ca8..9b147cd 100644
--- a/base/synchronization/spin_wait.h
+++ b/base/synchronization/spin_wait.h
@@ -16,7 +16,7 @@
#define BASE_SYNCHRONIZATION_SPIN_WAIT_H_
#include "base/threading/platform_thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
// Provide a macro that will wait no longer than 1 second for an asynchronous
// change is the value of an expression.
diff --git a/base/synchronization/waitable_event_unittest.cc b/base/synchronization/waitable_event_unittest.cc
index d00adc7..b66f6e8 100644
--- a/base/synchronization/waitable_event_unittest.cc
+++ b/base/synchronization/waitable_event_unittest.cc
@@ -5,8 +5,8 @@
#include "base/synchronization/waitable_event.h"
#include "base/compiler_specific.h"
-#include "base/time.h"
#include "base/threading/platform_thread.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/sys_info.cc b/base/sys_info.cc
index fa940bf..d43e932 100644
--- a/base/sys_info.cc
+++ b/base/sys_info.cc
@@ -4,7 +4,7 @@
#include "base/sys_info.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/system_monitor/system_monitor.cc b/base/system_monitor/system_monitor.cc
index b934139..d11ffc0 100644
--- a/base/system_monitor/system_monitor.cc
+++ b/base/system_monitor/system_monitor.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/task_runner.h b/base/task_runner.h
index 4fbea4d..7d07b8c 100644
--- a/base/task_runner.h
+++ b/base/task_runner.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace tracked_objects {
class Location;
diff --git a/base/test/mock_time_provider.h b/base/test/mock_time_provider.h
index b493209..7c58648 100644
--- a/base/test/mock_time_provider.h
+++ b/base/test/mock_time_provider.h
@@ -45,7 +45,7 @@
#ifndef BASE_TEST_MOCK_TIME_PROVIDER_H_
#define BASE_TEST_MOCK_TIME_PROVIDER_H_
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace base {
diff --git a/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h
index 761eefd..dacbb99 100644
--- a/base/test/sequenced_task_runner_test_template.h
+++ b/base/test/sequenced_task_runner_test_template.h
@@ -20,7 +20,7 @@
#include "base/sequenced_task_runner.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/test/simple_test_clock.h b/base/test/simple_test_clock.h
index f96dabf..2056aab 100644
--- a/base/test/simple_test_clock.h
+++ b/base/test/simple_test_clock.h
@@ -7,8 +7,8 @@
#include "base/compiler_specific.h"
#include "base/synchronization/lock.h"
-#include "base/time.h"
#include "base/time/clock.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/test/simple_test_tick_clock.h b/base/test/simple_test_tick_clock.h
index 2809774..867de80 100644
--- a/base/test/simple_test_tick_clock.h
+++ b/base/test/simple_test_tick_clock.h
@@ -7,8 +7,8 @@
#include "base/compiler_specific.h"
#include "base/synchronization/lock.h"
-#include "base/time.h"
#include "base/time/tick_clock.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/test/test_launcher.cc b/base/test/test_launcher.cc
index 9804cea..78f5ed3 100644
--- a/base/test/test_launcher.cc
+++ b/base/test/test_launcher.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/environment.h"
-#include "base/files/file_path.h"
#include "base/file_util.h"
+#include "base/files/file_path.h"
#include "base/format_macros.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
@@ -17,7 +17,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_timeouts.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_MACOSX)
diff --git a/base/test/test_launcher.h b/base/test/test_launcher.h
index 30d2829..9b4413d 100644
--- a/base/test/test_launcher.h
+++ b/base/test/test_launcher.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
-#include "base/time.h"
+#include "base/time/time.h"
class CommandLine;
diff --git a/base/test/test_pending_task.h b/base/test/test_pending_task.h
index c4a83bd..024e281 100644
--- a/base/test/test_pending_task.h
+++ b/base/test/test_pending_task.h
@@ -7,7 +7,7 @@
#include "base/callback.h"
#include "base/location.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index a4b1780..635423f 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -19,7 +19,7 @@
#include "base/process_util.h"
#include "base/test/multiprocess_test.h"
#include "base/test/test_timeouts.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"
diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
index 0c4587e..1778926 100644
--- a/base/test/test_timeouts.h
+++ b/base/test/test_timeouts.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/time.h"
+#include "base/time/time.h"
// Returns common timeouts to use in tests. Makes it possible to adjust
// the timeouts for different environments (like Valgrind).
diff --git a/base/threading/platform_thread.h b/base/threading/platform_thread.h
index c597500..9742d57 100644
--- a/base/threading/platform_thread.h
+++ b/base/threading/platform_thread.h
@@ -11,7 +11,7 @@
#include "base/base_export.h"
#include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "build/build_config.h"
#if defined(OS_WIN)
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc
index 20210bb..f98b23d 100644
--- a/base/threading/sequenced_worker_pool.cc
+++ b/base/threading/sequenced_worker_pool.cc
@@ -26,7 +26,7 @@
#include "base/threading/platform_thread.h"
#include "base/threading/simple_thread.h"
#include "base/threading/thread_restrictions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tracked_objects.h"
#if defined(OS_MACOSX)
diff --git a/base/threading/sequenced_worker_pool_unittest.cc b/base/threading/sequenced_worker_pool_unittest.cc
index 3d974c0..f1d7ed3 100644
--- a/base/threading/sequenced_worker_pool_unittest.cc
+++ b/base/threading/sequenced_worker_pool_unittest.cc
@@ -14,12 +14,12 @@
#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
-#include "base/test/sequenced_worker_pool_owner.h"
#include "base/test/sequenced_task_runner_test_template.h"
+#include "base/test/sequenced_worker_pool_owner.h"
#include "base/test/task_runner_test_template.h"
#include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tracked_objects.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/threading/watchdog.h b/base/threading/watchdog.h
index 5b0b210..abcb4f1 100644
--- a/base/threading/watchdog.h
+++ b/base/threading/watchdog.h
@@ -25,7 +25,7 @@
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/threading/platform_thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/threading/watchdog_unittest.cc b/base/threading/watchdog_unittest.cc
index 92ab02c..7a4be4c 100644
--- a/base/threading/watchdog_unittest.cc
+++ b/base/threading/watchdog_unittest.cc
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/synchronization/spin_wait.h"
#include "base/threading/platform_thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc
index 7eb73a7..3b19c09 100644
--- a/base/threading/worker_pool_unittest.cc
+++ b/base/threading/worker_pool_unittest.cc
@@ -9,10 +9,10 @@
#include "base/location.h"
#include "base/message_loop.h"
#include "base/run_loop.h"
-#include "base/test/test_timeouts.h"
-#include "base/time.h"
-#include "base/threading/thread_checker_impl.h"
#include "base/synchronization/waitable_event.h"
+#include "base/test/test_timeouts.h"
+#include "base/threading/thread_checker_impl.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
diff --git a/base/timer/timer.cc b/base/timer/timer.cc
index c7dcce0..ff1c087 100644
--- a/base/timer/timer.cc
+++ b/base/timer/timer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "base/logging.h"
#include "base/single_thread_task_runner.h"
diff --git a/base/timer/timer_unittest.cc b/base/timer/timer_unittest.cc
index 9fe21a4..0a4cbbd 100644
--- a/base/timer/timer_unittest.cc
+++ b/base/timer/timer_unittest.cc
@@ -4,7 +4,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::TimeDelta;
diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc
index 1e64508..6aa02ee 100644
--- a/base/tracked_objects_unittest.cc
+++ b/base/tracked_objects_unittest.cc
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/process_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
const int kLineNumber = 1776;
diff --git a/base/tracking_info.h b/base/tracking_info.h
index 738bdee..dacbcea 100644
--- a/base/tracking_info.h
+++ b/base/tracking_info.h
@@ -11,7 +11,7 @@
#ifndef BASE_TRACKING_INFO_H_
#define BASE_TRACKING_INFO_H_
-#include "base/time.h"
+#include "base/time/time.h"
namespace tracked_objects {
class Location;
diff --git a/base/value_conversions.cc b/base/value_conversions.cc
index b9c831e..2fd88f8 100644
--- a/base/value_conversions.cc
+++ b/base/value_conversions.cc
@@ -6,7 +6,7 @@
#include "base/files/file_path.h"
#include "base/strings/string_number_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/values.h"
namespace base {
diff --git a/base/vlog_unittest.cc b/base/vlog_unittest.cc
index 3a508f4..3a37cd9 100644
--- a/base/vlog_unittest.cc
+++ b/base/vlog_unittest.cc
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace logging {