Use a direct include of time headers in net/, part 1.

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

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

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

62 files changed, 71 insertions, 71 deletions

diff --git a/net/base/backoff_entry.h b/net/base/backoff_entry.h
index c50eafc..d8f03d3 100644
--- a/net/base/backoff_entry.h
+++ b/net/base/backoff_entry.h
@@ -6,7 +6,7 @@
 #define NET_BASE_BACKOFF_ENTRY_H_
 
 #include "base/threading/non_thread_safe.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 namespace net {
diff --git a/net/base/bandwidth_metrics.h b/net/base/bandwidth_metrics.h
index 2317056..e5f2646 100644
--- a/net/base/bandwidth_metrics.h
+++ b/net/base/bandwidth_metrics.h
@@ -7,9 +7,9 @@
 
 #include <list>
 
-#include "base/metrics/histogram.h"
 #include "base/logging.h"
-#include "base/time.h"
+#include "base/metrics/histogram.h"
+#include "base/time/time.h"
 
 namespace net {
 
diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h
index d23beb9..156a61d 100644
--- a/net/base/capturing_net_log.h
+++ b/net/base/capturing_net_log.h
@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_log.h"
 
 namespace base {
diff --git a/net/base/expiring_cache.h b/net/base/expiring_cache.h
index ee3fc3f..3fbde65 100644
--- a/net/base/expiring_cache.h
+++ b/net/base/expiring_cache.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
 
 namespace net {
 
diff --git a/net/base/expiring_cache_unittest.cc b/net/base/expiring_cache_unittest.cc
index bf610f7..74b069d 100644
--- a/net/base/expiring_cache_unittest.cc
+++ b/net/base/expiring_cache_unittest.cc
@@ -9,7 +9,7 @@
 
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/net/base/filter.h b/net/base/filter.h
index 05a90d0..9511511f 100644
--- a/net/base/filter.h
+++ b/net/base/filter.h
@@ -36,7 +36,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 class GURL;
diff --git a/net/base/load_timing_info.h b/net/base/load_timing_info.h
index 1d4e18f..b4acd58 100644
--- a/net/base/load_timing_info.h
+++ b/net/base/load_timing_info.h
@@ -6,7 +6,7 @@
 #define NET_BASE_LOAD_TIMING_INFO_H_
 
 #include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 namespace net {
diff --git a/net/base/net_log.cc b/net/base/net_log.cc
index 14f485e..d1e9c98 100644
--- a/net/base/net_log.cc
+++ b/net/base/net_log.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "net/base/net_errors.h"
 
diff --git a/net/base/net_log.h b/net/base/net_log.h
index 5623eca..875d785 100644
--- a/net/base/net_log.h
+++ b/net/base/net_log.h
@@ -14,7 +14,7 @@
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 namespace base {
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index f4844f7..5f08d1f 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -50,7 +50,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/sys_byteorder.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 7ff261e..fbf069f 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -17,7 +17,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/test/test_file_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/net/base/network_change_notifier.h b/net/base/network_change_notifier.h
index 67d8ed9..2ac6f57 100644
--- a/net/base/network_change_notifier.h
+++ b/net/base/network_change_notifier.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/observer_list_threadsafe.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 class GURL;
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc
index ad18c1c..d53b346 100644
--- a/net/base/network_change_notifier_win.cc
+++ b/net/base/network_change_notifier_win.cc
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/winsock_init.h"
 #include "net/dns/dns_config_service.h"
 
diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h
index ef239aa..47a97df 100644
--- a/net/base/network_change_notifier_win.h
+++ b/net/base/network_change_notifier_win.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "base/win/object_watcher.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
diff --git a/net/base/network_time_notifier.h b/net/base/network_time_notifier.h
index 06fb803..62e2348 100644
--- a/net/base/network_time_notifier.h
+++ b/net/base/network_time_notifier.h
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "base/time.h"
 #include "base/time/tick_clock.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 namespace net {
diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h
index dc35bd2..f275c8f 100644
--- a/net/base/sdch_manager.h
+++ b/net/base/sdch_manager.h
@@ -27,8 +27,8 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
 #include "base/threading/non_thread_safe.h"
+#include "base/time/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_export.h"
 
diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc
index a31dd5c..bdf73ab 100644
--- a/net/base/upload_data_stream_unittest.cc
+++ b/net/base/upload_data_stream_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
diff --git a/net/base/upload_element.h b/net/base/upload_element.h
index 3c91e02..34f6014 100644
--- a/net/base/upload_element.h
+++ b/net/base/upload_element.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 namespace net {
diff --git a/net/base/upload_file_element_reader.h b/net/base/upload_file_element_reader.h
index 9fe8500a..a805c7a 100644
--- a/net/base/upload_file_element_reader.h
+++ b/net/base/upload_file_element_reader.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/upload_element_reader.h"
 
 namespace base {
diff --git a/net/cert/crl_set.cc b/net/cert/crl_set.cc
index 2bdd5f4..2ef1b1f 100644
--- a/net/cert/crl_set.cc
+++ b/net/cert/crl_set.cc
@@ -9,7 +9,7 @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "crypto/sha2.h"
 #include "net/cert/crl_set.h"
diff --git a/net/cert/multi_threaded_cert_verifier.cc b/net/cert/multi_threaded_cert_verifier.cc
index f89454d..ddfdcac 100644
--- a/net/cert/multi_threaded_cert_verifier.cc
+++ b/net/cert/multi_threaded_cert_verifier.cc
@@ -14,7 +14,7 @@
 #include "base/stl_util.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/worker_pool.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/cert/cert_trust_anchor_provider.h"
diff --git a/net/cert/x509_cert_types.cc b/net/cert/x509_cert_types.cc
index 9c30fb5..dec9b97 100644
--- a/net/cert/x509_cert_types.cc
+++ b/net/cert/x509_cert_types.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/cert/x509_certificate.h"
 
 namespace net {
diff --git a/net/cert/x509_certificate.cc b/net/cert/x509_certificate.cc
index 93bdd6c..5a3b18d 100644
--- a/net/cert/x509_certificate.cc
+++ b/net/cert/x509_certificate.cc
@@ -21,7 +21,7 @@
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "googleurl/src/url_canon.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
diff --git a/net/cert/x509_certificate.h b/net/cert/x509_certificate.h
index efaa2f7..28961ee 100644
--- a/net/cert/x509_certificate.h
+++ b/net/cert/x509_certificate.h
@@ -13,7 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_piece.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/cert/cert_type.h"
 #include "net/cert/x509_cert_types.h"
diff --git a/net/cert/x509_certificate_ios.cc b/net/cert/x509_certificate_ios.cc
index efeb54e..48f833f 100644
--- a/net/cert/x509_certificate_ios.cc
+++ b/net/cert/x509_certificate_ios.cc
@@ -25,7 +25,7 @@
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/base/net_errors.h"
diff --git a/net/cert/x509_certificate_nss.cc b/net/cert/x509_certificate_nss.cc
index 8448a49..ca25650 100644
--- a/net/cert/x509_certificate_nss.cc
+++ b/net/cert/x509_certificate_nss.cc
@@ -18,7 +18,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/cert/x509_util_nss.h"
diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc
index 4dbadb1..8beb557 100644
--- a/net/cert/x509_util.cc
+++ b/net/cert/x509_util.cc
@@ -4,7 +4,7 @@
 
 #include "net/cert/x509_util.h"
 
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/cert/x509_certificate.h"
 
 namespace net {
diff --git a/net/cert/x509_util.h b/net/cert/x509_util.h
index c618fe9..8a6bae2 100644
--- a/net/cert/x509_util.h
+++ b/net/cert/x509_util.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 namespace crypto {
diff --git a/net/cert/x509_util_nss.h b/net/cert/x509_util_nss.h
index 493e661..877dc48 100644
--- a/net/cert/x509_util_nss.h
+++ b/net/cert/x509_util_nss.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/cert/x509_certificate.h"
 
diff --git a/net/cert/x509_util_unittest.cc b/net/cert/x509_util_unittest.cc
index e0c1ec6..cc13d96 100644
--- a/net/cert/x509_util_unittest.cc
+++ b/net/cert/x509_util_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "crypto/rsa_private_key.h"
 #include "net/cert/x509_certificate.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/cookies/canonical_cookie.h b/net/cookies/canonical_cookie.h
index 341f58b1..a78eece 100644
--- a/net/cookies/canonical_cookie.h
+++ b/net/cookies/canonical_cookie.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_options.h"
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
index e637372..d248f10 100644
--- a/net/cookies/cookie_monster.h
+++ b/net/cookies/cookie_monster.h
@@ -21,7 +21,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"
diff --git a/net/cookies/cookie_monster_store_test.cc b/net/cookies/cookie_monster_store_test.cc
index 7a401f9..7a1b8ad 100644
--- a/net/cookies/cookie_monster_store_test.cc
+++ b/net/cookies/cookie_monster_store_test.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_util.h"
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc
index f6e0ae3..21b3fb5 100644
--- a/net/cookies/cookie_monster_unittest.cc
+++ b/net/cookies/cookie_monster_unittest.cc
@@ -21,7 +21,7 @@
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"
diff --git a/net/cookies/cookie_store.h b/net/cookies/cookie_store.h
index 27a9f1e..af99637 100644
--- a/net/cookies/cookie_store.h
+++ b/net/cookies/cookie_store.h
@@ -13,9 +13,9 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "base/time.h"
-#include "net/cookies/cookie_options.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
+#include "net/cookies/cookie_options.h"
 
 class GURL;
 
diff --git a/net/cookies/cookie_util.h b/net/cookies/cookie_util.h
index 2995aa0..aaaf27d 100644
--- a/net/cookies/cookie_util.h
+++ b/net/cookies/cookie_util.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 
 class GURL;
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index 0a2618b..f1f248b 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -18,8 +18,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/cache_util.h"
 #include "net/disk_cache/disk_format.h"
diff --git a/net/disk_cache/backend_impl.h b/net/disk_cache/backend_impl.h
index 07a5f32..982bee6 100644
--- a/net/disk_cache/backend_impl.h
+++ b/net/disk_cache/backend_impl.h
@@ -9,7 +9,7 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "net/disk_cache/block_files.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/disk_cache/eviction.h"
diff --git a/net/disk_cache/block_files.cc b/net/disk_cache/block_files.cc
index 8732212..fc378e6 100644
--- a/net/disk_cache/block_files.cc
+++ b/net/disk_cache/block_files.cc
@@ -10,7 +10,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_checker.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/cache_util.h"
 #include "net/disk_cache/file_lock.h"
 #include "net/disk_cache/trace.h"
diff --git a/net/disk_cache/disk_cache.h b/net/disk_cache/disk_cache.h
index 3b5c912..33b49b9 100644
--- a/net/disk_cache/disk_cache.h
+++ b/net/disk_cache/disk_cache.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/cache_type.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc
index 4aa7eca..a2474da 100644
--- a/net/disk_cache/disk_cache_perftest.cc
+++ b/net/disk_cache/disk_cache_perftest.cc
@@ -10,15 +10,15 @@
 #include "base/hash.h"
 #include "base/perftimer.h"
 #include "base/strings/string_util.h"
-#include "base/threading/thread.h"
 #include "base/test/test_file_util.h"
-#include "base/timer.h"
+#include "base/threading/thread.h"
+#include "base/timer/timer.h"
 #include "net/base/cache_type.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
-#include "net/disk_cache/block_files.h"
 #include "net/disk_cache/backend_impl.h"
+#include "net/disk_cache/block_files.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/disk_cache/disk_cache_test_base.h"
 #include "net/disk_cache/disk_cache_test_util.h"
diff --git a/net/disk_cache/disk_cache_test_util.h b/net/disk_cache/disk_cache_test_util.h
index 2671827..bacf54f 100644
--- a/net/disk_cache/disk_cache_test_util.h
+++ b/net/disk_cache/disk_cache_test_util.h
@@ -9,7 +9,7 @@
 
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "base/tuple.h"
 #include "build/build_config.h"
 
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc
index 01645dc..e93eb7b 100644
--- a/net/disk_cache/entry_unittest.cc
+++ b/net/disk_cache/entry_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/platform_thread.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
diff --git a/net/disk_cache/eviction.cc b/net/disk_cache/eviction.cc
index 7be62914..f00cf99 100644
--- a/net/disk_cache/eviction.cc
+++ b/net/disk_cache/eviction.cc
@@ -33,7 +33,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/strings/string_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/backend_impl.h"
 #include "net/disk_cache/disk_format.h"
 #include "net/disk_cache/entry_impl.h"
diff --git a/net/disk_cache/flash/flash_cache_test_base.cc b/net/disk_cache/flash/flash_cache_test_base.cc
index 17ce783..164eb33 100644
--- a/net/disk_cache/flash/flash_cache_test_base.cc
+++ b/net/disk_cache/flash/flash_cache_test_base.cc
@@ -6,7 +6,7 @@
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/flash/format.h"
 #include "net/disk_cache/flash/log_store.h"
 #include "net/disk_cache/flash/storage.h"
diff --git a/net/disk_cache/in_flight_backend_io.h b/net/disk_cache/in_flight_backend_io.h
index 5767213..4ff081d 100644
--- a/net/disk_cache/in_flight_backend_io.h
+++ b/net/disk_cache/in_flight_backend_io.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/message_loop/message_loop_proxy.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/disk_cache/in_flight_io.h"
diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc
index 4dd9319..19f7687 100644
--- a/net/disk_cache/simple/simple_backend_impl.cc
+++ b/net/disk_cache/simple/simple_backend_impl.cc
@@ -17,7 +17,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/sys_info.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/backend_impl.h"
 #include "net/disk_cache/simple/simple_entry_format.h"
diff --git a/net/disk_cache/simple/simple_entry_impl.cc b/net/disk_cache/simple/simple_entry_impl.cc
index fe92f29..4548d47 100644
--- a/net/disk_cache/simple/simple_entry_impl.cc
+++ b/net/disk_cache/simple/simple_entry_impl.cc
@@ -16,7 +16,7 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/task_runner.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/simple/simple_backend_impl.h"
diff --git a/net/disk_cache/simple/simple_index.cc b/net/disk_cache/simple/simple_index.cc
index 309614b..bd687f5 100644
--- a/net/disk_cache/simple/simple_index.cc
+++ b/net/disk_cache/simple/simple_index.cc
@@ -19,7 +19,7 @@
 #include "base/strings/string_tokenizer.h"
 #include "base/task_runner.h"
 #include "base/threading/worker_pool.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/simple/simple_entry_format.h"
 #include "net/disk_cache/simple/simple_index_file.h"
diff --git a/net/disk_cache/simple/simple_index.h b/net/disk_cache/simple/simple_index.h
index 2f24897..093c6a8 100644
--- a/net/disk_cache/simple/simple_index.h
+++ b/net/disk_cache/simple/simple_index.h
@@ -19,8 +19,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_checker.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 
diff --git a/net/disk_cache/simple/simple_index_file_unittest.cc b/net/disk_cache/simple/simple_index_file_unittest.cc
index 6d372032..6c64301 100644
--- a/net/disk_cache/simple/simple_index_file_unittest.cc
+++ b/net/disk_cache/simple/simple_index_file_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/simple/simple_entry_format.h"
 #include "net/disk_cache/simple/simple_index.h"
 #include "net/disk_cache/simple/simple_index_file.h"
diff --git a/net/disk_cache/simple/simple_index_unittest.cc b/net/disk_cache/simple/simple_index_unittest.cc
index 52875e2..c7f0243 100644
--- a/net/disk_cache/simple/simple_index_unittest.cc
+++ b/net/disk_cache/simple/simple_index_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/task_runner.h"
 #include "base/threading/platform_thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/simple/simple_index.h"
 #include "net/disk_cache/simple/simple_index_file.h"
 #include "net/disk_cache/simple/simple_util.h"
diff --git a/net/disk_cache/simple/simple_synchronous_entry.h b/net/disk_cache/simple/simple_synchronous_entry.h
index fb1cc0e..ce38341 100644
--- a/net/disk_cache/simple/simple_synchronous_entry.h
+++ b/net/disk_cache/simple/simple_synchronous_entry.h
@@ -13,7 +13,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/simple/simple_entry_format.h"
 
 namespace net {
diff --git a/net/disk_cache/simple/simple_util.cc b/net/disk_cache/simple/simple_util.cc
index 6fe4136..40d3894 100644
--- a/net/disk_cache/simple/simple_util.cc
+++ b/net/disk_cache/simple/simple_util.cc
@@ -10,10 +10,10 @@
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/sha1.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/simple/simple_entry_format.h"
 
 namespace {
diff --git a/net/disk_cache/sparse_control.cc b/net/disk_cache/sparse_control.cc
index 2894cb1..130bbe6 100644
--- a/net/disk_cache/sparse_control.cc
+++ b/net/disk_cache/sparse_control.cc
@@ -10,7 +10,7 @@
 #include "base/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/backend_impl.h"
diff --git a/net/disk_cache/v3/backend_impl_v3.cc b/net/disk_cache/v3/backend_impl_v3.cc
index 2dfbe12..cf0fbcb 100644
--- a/net/disk_cache/v3/backend_impl_v3.cc
+++ b/net/disk_cache/v3/backend_impl_v3.cc
@@ -18,8 +18,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/cache_util.h"
 #include "net/disk_cache/entry_impl.h"
diff --git a/net/disk_cache/v3/backend_impl_v3.h b/net/disk_cache/v3/backend_impl_v3.h
index 947e65c..08cc5b1 100644
--- a/net/disk_cache/v3/backend_impl_v3.h
+++ b/net/disk_cache/v3/backend_impl_v3.h
@@ -9,7 +9,7 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "net/disk_cache/block_files.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/disk_cache/eviction.h"
diff --git a/net/disk_cache/v3/backend_worker.cc b/net/disk_cache/v3/backend_worker.cc
index cd240cd..7db4d76 100644
--- a/net/disk_cache/v3/backend_worker.cc
+++ b/net/disk_cache/v3/backend_worker.cc
@@ -18,8 +18,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/cache_util.h"
 #include "net/disk_cache/entry_impl.h"
diff --git a/net/disk_cache/v3/backend_worker.h b/net/disk_cache/v3/backend_worker.h
index dd0affd..42fd4b2 100644
--- a/net/disk_cache/v3/backend_worker.h
+++ b/net/disk_cache/v3/backend_worker.h
@@ -9,7 +9,7 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
 #include "net/disk_cache/block_files.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/disk_cache/eviction.h"
diff --git a/net/disk_cache/v3/block_bitmaps.cc b/net/disk_cache/v3/block_bitmaps.cc
index 2bb251b..0d0317b 100644
--- a/net/disk_cache/v3/block_bitmaps.cc
+++ b/net/disk_cache/v3/block_bitmaps.cc
@@ -10,7 +10,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_checker.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/cache_util.h"
 #include "net/disk_cache/file_lock.h"
 #include "net/disk_cache/trace.h"
diff --git a/net/disk_cache/v3/eviction_v3.cc b/net/disk_cache/v3/eviction_v3.cc
index 4f14d55..d613d4d 100644
--- a/net/disk_cache/v3/eviction_v3.cc
+++ b/net/disk_cache/v3/eviction_v3.cc
@@ -33,7 +33,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/strings/string_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/disk_cache/backend_impl.h"
 #include "net/disk_cache/entry_impl.h"
 #include "net/disk_cache/experiments.h"
diff --git a/net/disk_cache/v3/sparse_control_v3.cc b/net/disk_cache/v3/sparse_control_v3.cc
index 2658cef..e24e194 100644
--- a/net/disk_cache/v3/sparse_control_v3.cc
+++ b/net/disk_cache/v3/sparse_control_v3.cc
@@ -10,7 +10,7 @@
 #include "base/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/backend_impl.h"