Use a direct include of time headers in base/, part 1.
BUG=254986
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18051003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209044 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 99084f64837cfdd932b541b05a6b4a4f95ff4e6f
diff --git a/base/build_time.cc b/base/build_time.cc
index bb2274b..760269a 100644
--- a/base/build_time.cc
+++ b/base/build_time.cc
@@ -5,7 +5,7 @@
#include "base/build_time.h"
#include "base/logging.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/build_time.h b/base/build_time.h
index e7bbb39..73c01b0 100644
--- a/base/build_time.h
+++ b/base/build_time.h
@@ -6,7 +6,7 @@
#define BASE_BUILD_TIME_
#include "base/base_export.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index 0885cab..d97c461 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -26,7 +26,7 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread_id_name_manager.h"
#include "base/threading/thread_local.h"
-#include "base/time.h"
+#include "base/time/time.h"
#if defined(OS_WIN)
#include "base/debug/trace_event_win.h"
diff --git a/base/debug/trace_event_impl.h b/base/debug/trace_event_impl.h
index 3ff6c55..bd7af7e 100644
--- a/base/debug/trace_event_impl.h
+++ b/base/debug/trace_event_impl.h
@@ -20,7 +20,7 @@
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
// Older style trace macros with explicit id and extra data
// Only these macros result in publishing data to ETW as currently implemented.
diff --git a/base/debug/trace_event_unittest.h b/base/debug/trace_event_unittest.h
index 3b570e1..599fec7 100644
--- a/base/debug/trace_event_unittest.h
+++ b/base/debug/trace_event_unittest.h
@@ -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/time.h"
+#include "base/time/time.h"
namespace base {
namespace debug {
diff --git a/base/deferred_sequenced_task_runner.h b/base/deferred_sequenced_task_runner.h
index d1cdb43..00ab050 100644
--- a/base/deferred_sequenced_task_runner.h
+++ b/base/deferred_sequenced_task_runner.h
@@ -14,7 +14,7 @@
#include "base/memory/ref_counted.h"
#include "base/sequenced_task_runner.h"
#include "base/synchronization/lock.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tracked_objects.h"
namespace base {
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 340a42f..77e080a 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -44,7 +44,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#if defined(OS_ANDROID)
#include "base/os_compat_android.h"
diff --git a/base/files/file_enumerator.h b/base/files/file_enumerator.h
index a5fd26e..ce9bd1f 100644
--- a/base/files/file_enumerator.h
+++ b/base/files/file_enumerator.h
@@ -11,7 +11,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"
#include "build/build_config.h"
#if defined(OS_WIN)
diff --git a/base/files/important_file_writer.cc b/base/files/important_file_writer.cc
index e58dcf3..ab62cc3 100644
--- a/base/files/important_file_writer.cc
+++ b/base/files/important_file_writer.cc
@@ -17,7 +17,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/task_runner.h"
#include "base/threading/thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/files/important_file_writer.h b/base/files/important_file_writer.h
index 190a60b..ba1c745 100644
--- a/base/files/important_file_writer.h
+++ b/base/files/important_file_writer.h
@@ -12,8 +12,8 @@
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/threading/non_thread_safe.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
namespace base {
diff --git a/base/files/important_file_writer_unittest.cc b/base/files/important_file_writer_unittest.cc
index 56a5fa6..759436c 100644
--- a/base/files/important_file_writer_unittest.cc
+++ b/base/files/important_file_writer_unittest.cc
@@ -12,7 +12,7 @@
#include "base/message_loop.h"
#include "base/run_loop.h"
#include "base/threading/thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc
index dbe74d8..ca94ead 100644
--- a/base/i18n/time_formatting.cc
+++ b/base/i18n/time_formatting.cc
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "third_party/icu/public/i18n/unicode/datefmt.h"
#include "third_party/icu/public/i18n/unicode/dtptngen.h"
#include "third_party/icu/public/i18n/unicode/smpdtfmt.h"
diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc
index 655d735..b6992eb 100644
--- a/base/i18n/time_formatting_unittest.cc
+++ b/base/i18n/time_formatting_unittest.cc
@@ -6,7 +6,7 @@
#include "base/i18n/rtl.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/icu/public/common/unicode/uversion.h"
diff --git a/base/memory/shared_memory_unittest.cc b/base/memory/shared_memory_unittest.cc
index 5c0cc8b..89db511 100644
--- a/base/memory/shared_memory_unittest.cc
+++ b/base/memory/shared_memory_unittest.cc
@@ -11,7 +11,7 @@
#include "base/sys_info.h"
#include "base/test/multiprocess_test.h"
#include "base/threading/platform_thread.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/message_loop/message_loop.cc b/base/message_loop/message_loop.cc
index 4e0c5f6..9e33a42 100644
--- a/base/message_loop/message_loop.cc
+++ b/base/message_loop/message_loop.cc
@@ -21,7 +21,7 @@
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "base/thread_task_runner_handle.h"
#include "base/threading/thread_local.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tracked_objects.h"
#if defined(OS_MACOSX)
diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index e765cef..846cc8d 100644
--- a/base/message_loop/message_loop.h
+++ b/base/message_loop/message_loop.h
@@ -19,8 +19,8 @@
#include "base/pending_task.h"
#include "base/sequenced_task_runner_helpers.h"
#include "base/synchronization/lock.h"
+#include "base/time/time.h"
#include "base/tracking_info.h"
-#include "base/time.h"
#if defined(OS_WIN)
// We need this to declare base::MessagePumpWin::Dispatcher, which we should
diff --git a/base/message_loop/message_pump_android.cc b/base/message_loop/message_pump_android.cc
index d7bf9a9..dda8730 100644
--- a/base/message_loop/message_pump_android.cc
+++ b/base/message_loop/message_pump_android.cc
@@ -11,7 +11,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/run_loop.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "jni/SystemMessageHandler_jni.h"
using base::android::ScopedJavaLocalRef;
diff --git a/base/message_loop/message_pump_default.h b/base/message_loop/message_pump_default.h
index dd65973..07a6c70 100644
--- a/base/message_loop/message_pump_default.h
+++ b/base/message_loop/message_pump_default.h
@@ -7,7 +7,7 @@
#include "base/message_loop/message_pump.h"
#include "base/synchronization/waitable_event.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/message_loop/message_pump_glib.h b/base/message_loop/message_pump_glib.h
index e45591b..775470e 100644
--- a/base/message_loop/message_pump_glib.h
+++ b/base/message_loop/message_pump_glib.h
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_pump.h"
#include "base/observer_list.h"
-#include "base/time.h"
+#include "base/time/time.h"
typedef struct _GMainContext GMainContext;
typedef struct _GPollFD GPollFD;
diff --git a/base/message_loop/message_pump_libevent.cc b/base/message_loop/message_pump_libevent.cc
index 8de0db2..6d862d1 100644
--- a/base/message_loop/message_pump_libevent.cc
+++ b/base/message_loop/message_pump_libevent.cc
@@ -14,7 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/posix/eintr_wrapper.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "third_party/libevent/event.h"
#if defined(OS_MACOSX)
diff --git a/base/message_loop/message_pump_libevent.h b/base/message_loop/message_pump_libevent.h
index a54ef88..3b1d26d 100644
--- a/base/message_loop/message_pump_libevent.h
+++ b/base/message_loop/message_pump_libevent.h
@@ -11,7 +11,7 @@
#include "base/message_loop/message_pump.h"
#include "base/observer_list.h"
#include "base/threading/thread_checker.h"
-#include "base/time.h"
+#include "base/time/time.h"
// Declare structs we need from libevent.h rather than including it
struct event_base;
diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h
index 5ce9792..3c295ea 100644
--- a/base/metrics/field_trial.h
+++ b/base/metrics/field_trial.h
@@ -85,7 +85,7 @@
#include "base/memory/ref_counted.h"
#include "base/observer_list_threadsafe.h"
#include "base/synchronization/lock.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
index 033cb72..d82f90a 100644
--- a/base/metrics/histogram.h
+++ b/base/metrics/histogram.h
@@ -77,7 +77,7 @@
#include "base/metrics/bucket_ranges.h"
#include "base/metrics/histogram_base.h"
#include "base/metrics/histogram_samples.h"
-#include "base/time.h"
+#include "base/time/time.h"
class Pickle;
class PickleIterator;
diff --git a/base/metrics/histogram_base.h b/base/metrics/histogram_base.h
index 9faca2c..f5448e7 100644
--- a/base/metrics/histogram_base.h
+++ b/base/metrics/histogram_base.h
@@ -10,7 +10,7 @@
#include "base/base_export.h"
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
class Pickle;
class PickleIterator;
diff --git a/base/metrics/histogram_unittest.cc b/base/metrics/histogram_unittest.cc
index 6ff7d00..e7a01aa 100644
--- a/base/metrics/histogram_unittest.cc
+++ b/base/metrics/histogram_unittest.cc
@@ -15,7 +15,7 @@
#include "base/metrics/sample_vector.h"
#include "base/metrics/statistics_recorder.h"
#include "base/pickle.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
using std::vector;
diff --git a/base/metrics/stats_counters.h b/base/metrics/stats_counters.h
index ccc73ba..d47bab3 100644
--- a/base/metrics/stats_counters.h
+++ b/base/metrics/stats_counters.h
@@ -10,7 +10,7 @@
#include "base/base_export.h"
#include "base/compiler_specific.h"
#include "base/metrics/stats_table.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
diff --git a/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc
index fe45b59..a611e4d 100644
--- a/base/nix/mime_util_xdg.cc
+++ b/base/nix/mime_util_xdg.cc
@@ -21,7 +21,7 @@
#include "base/synchronization/lock.h"
#include "base/third_party/xdg_mime/xdgmime.h"
#include "base/threading/thread_restrictions.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace base {
namespace nix {