From 66e96c418e3f2476422c538d65b449cd8155d266 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Fri, 28 Jun 2013 15:20:31 +0000 Subject: Use a direct include of time headers in net/, part 2. BUG=254986 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/18054010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209150 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/http_cache.h | 2 +- net/http/http_cache_transaction.cc | 2 +- net/http/http_cache_transaction.h | 4 ++-- net/http/http_network_transaction.h | 2 +- net/http/http_proxy_client_socket_pool.cc | 2 +- net/http/http_proxy_client_socket_pool.h | 4 ++-- net/http/http_response_body_drainer.h | 2 +- net/http/http_response_headers.cc | 2 +- net/http/http_response_headers_unittest.cc | 2 +- net/http/http_response_info.cc | 2 +- net/http/http_response_info.h | 2 +- net/http/http_security_headers.h | 2 +- net/http/http_transaction_unittest.cc | 2 +- net/http/http_util.cc | 2 +- net/http/transport_security_state.cc | 2 +- net/http/transport_security_state.h | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) (limited to 'net/http') diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 6b1d162..c401265 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -25,7 +25,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop_proxy.h" #include "base/threading/non_thread_safe.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/load_states.h" diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index 64d47b7..8d4a455 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -22,7 +22,7 @@ #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h index c0a2ef9..0d70a25 100644 --- a/net/http/http_cache_transaction.h +++ b/net/http/http_cache_transaction.h @@ -10,13 +10,13 @@ #include -#include "base/time.h" +#include "base/time/time.h" #include "net/base/completion_callback.h" #include "net/base/net_log.h" #include "net/base/request_priority.h" #include "net/http/http_cache.h" -#include "net/http/http_response_info.h" #include "net/http/http_request_headers.h" +#include "net/http/http_response_info.h" #include "net/http/http_transaction.h" namespace net { diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index 2e98fc2..6228487 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -11,7 +11,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_log.h" #include "net/base/request_priority.h" #include "net/http/http_auth.h" diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index 448c8fd..9f4cbb9 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -7,7 +7,7 @@ #include #include "base/compiler_specific.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h index e1fb20f..a15b8ca 100644 --- a/net/http/http_proxy_client_socket_pool.h +++ b/net/http/http_proxy_client_socket_pool.h @@ -11,15 +11,15 @@ #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/host_port_pair.h" #include "net/base/net_export.h" #include "net/http/http_auth.h" #include "net/http/http_response_info.h" #include "net/http/proxy_client_socket.h" +#include "net/socket/client_socket_pool.h" #include "net/socket/client_socket_pool_base.h" #include "net/socket/client_socket_pool_histograms.h" -#include "net/socket/client_socket_pool.h" #include "net/socket/ssl_client_socket.h" #include "net/spdy/spdy_session.h" diff --git a/net/http/http_response_body_drainer.h b/net/http/http_response_body_drainer.h index adc6ce5..915305c 100644 --- a/net/http/http_response_body_drainer.h +++ b/net/http/http_response_body_drainer.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "net/base/completion_callback.h" #include "net/base/net_export.h" #include "net/http/http_network_session.h" diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc index bffa004..6047aa1 100644 --- a/net/http/http_response_headers.cc +++ b/net/http/http_response_headers.cc @@ -18,7 +18,7 @@ #include "base/strings/string_piece.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 "net/base/escape.h" #include "net/http/http_util.h" diff --git a/net/http/http_response_headers_unittest.cc b/net/http/http_response_headers_unittest.cc index ee489c4..8bde289e 100644 --- a/net/http/http_response_headers_unittest.cc +++ b/net/http/http_response_headers_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "net/http/http_response_headers.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc index a3dcfec..368c1c7 100644 --- a/net/http/http_response_info.cc +++ b/net/http/http_response_info.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/pickle.h" -#include "base/time.h" +#include "base/time/time.h" #include "net/base/auth.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/http/http_response_info.h b/net/http/http_response_info.h index 4210db6..5c15cb9 100644 --- a/net/http/http_response_info.h +++ b/net/http/http_response_info.h @@ -7,7 +7,7 @@ #include -#include "base/time.h" +#include "base/time/time.h" #include "net/base/host_port_pair.h" #include "net/base/net_export.h" #include "net/http/http_vary_data.h" diff --git a/net/http/http_security_headers.h b/net/http/http_security_headers.h index fd6632c..b000971 100644 --- a/net/http/http_security_headers.h +++ b/net/http/http_security_headers.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/hash_value.h" #include "net/base/net_export.h" diff --git a/net/http/http_transaction_unittest.cc b/net/http/http_transaction_unittest.cc index 80aeafd..bcd1a01 100644 --- a/net/http/http_transaction_unittest.cc +++ b/net/http/http_transaction_unittest.cc @@ -9,7 +9,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 "net/base/load_flags.h" #include "net/base/load_timing_info.h" #include "net/base/net_errors.h" diff --git a/net/http/http_util.cc b/net/http/http_util.cc index 6fb5bd1..77f4981 100644 --- a/net/http/http_util.cc +++ b/net/http/http_util.cc @@ -16,7 +16,7 @@ #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" using std::string; diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc index f7ed7e8..92a223c 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -26,7 +26,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" diff --git a/net/http/transport_security_state.h b/net/http/transport_security_state.h index 894848f..60df04a 100644 --- a/net/http/transport_security_state.h +++ b/net/http/transport_security_state.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/threading/non_thread_safe.h" -#include "base/time.h" +#include "base/time/time.h" #include "net/base/net_export.h" #include "net/cert/x509_cert_types.h" #include "net/cert/x509_certificate.h" -- cgit v1.1