Skip to content

Commit

Permalink
Use a direct include of time headers in net/, part 2.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
avi@chromium.org committed Jun 28, 2013
1 parent b43e556 commit 66e96c4
Show file tree
Hide file tree
Showing 51 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions net/dns/dns_config_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.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"
// Needed on shared build with MSVS2010 to avoid multiple definitions of
// std::vector<IPEndPoint>.
#include "net/base/address_list.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/dns_config_service_posix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "base/files/file_path_watcher.h"
#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_util.h"
#include "net/dns/dns_hosts.h"
Expand Down
4 changes: 2 additions & 2 deletions net/dns/dns_config_service_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/threading/non_thread_safe.h"
#include "base/threading/thread_restrictions.h"
#include "base/time.h"
#include "base/time/time.h"
#include "base/win/object_watcher.h"
#include "base/win/registry.h"
#include "base/win/windows_version.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/dns_response.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/basictypes.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/base/net_util.h"

Expand Down
2 changes: 1 addition & 1 deletion net/dns/dns_response_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "net/dns/dns_response.h"

#include "base/time.h"
#include "base/time/time.h"
#include "net/base/address_list.h"
#include "net/base/io_buffer.h"
#include "net/base/net_util.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/dns_session.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "base/metrics/sample_vector.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
#include "net/dns/dns_config_service.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/dns_session.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/metrics/bucket_ranges.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/net_export.h"
#include "net/base/rand_callback.h"
#include "net/dns/dns_config_service.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/dns_transaction.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
#include "base/threading/non_thread_safe.h"
#include "base/timer.h"
#include "base/timer/timer.h"
#include "base/values.h"
#include "net/base/big_endian.h"
#include "net/base/completion_callback.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/host_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/address_family.h"
#include "net/base/address_list.h"
#include "net/base/expiring_cache.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/host_resolver_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/worker_pool.h"
#include "base/time.h"
#include "base/time/time.h"
#include "base/values.h"
#include "net/base/address_family.h"
#include "net/base/address_list.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/host_resolver_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/capturing_net_log.h"
#include "net/base/net_export.h"
#include "net/base/network_change_notifier.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/host_resolver_impl_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/test/test_timeouts.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/address_list.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
Expand Down
2 changes: 1 addition & 1 deletion net/dns/mdns_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/net_export.h"

namespace net {
Expand Down
2 changes: 1 addition & 1 deletion net/dns/record_parsed.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <string>

#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/net_export.h"

namespace net {
Expand Down
2 changes: 1 addition & 1 deletion net/ftp/ftp_directory_listing_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "base/basictypes.h"
#include "base/strings/string16.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/base/net_export.h"

namespace net {
Expand Down
4 changes: 2 additions & 2 deletions net/ftp/ftp_directory_listing_parser_ls.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <vector>

#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/ftp/ftp_directory_listing_parser.h"
#include "net/ftp/ftp_util.h"

Expand Down
4 changes: 2 additions & 2 deletions net/ftp/ftp_directory_listing_parser_os2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include <vector>

#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/string_split.h"
#include "base/time.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "net/ftp/ftp_directory_listing_parser.h"
#include "net/ftp/ftp_util.h"

Expand Down
4 changes: 2 additions & 2 deletions net/ftp/ftp_directory_listing_parser_vms.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <vector>

#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "base/time/time.h"
#include "net/ftp/ftp_directory_listing_parser.h"
#include "net/ftp/ftp_util.h"

Expand Down
4 changes: 2 additions & 2 deletions net/ftp/ftp_directory_listing_parser_windows.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include <vector>

#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/string_split.h"
#include "base/time.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "net/ftp/ftp_directory_listing_parser.h"
#include "net/ftp/ftp_util.h"

Expand Down
2 changes: 1 addition & 1 deletion net/ftp/ftp_response_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef NET_FTP_FTP_RESPONSE_INFO_H_
#define NET_FTP_FTP_RESPONSE_INFO_H_

#include "base/time.h"
#include "base/time/time.h"
#include "net/base/host_port_pair.h"

namespace net {
Expand Down
4 changes: 2 additions & 2 deletions net/ftp/ftp_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "base/time/time.h"
#include "third_party/icu/public/common/unicode/uchar.h"
#include "third_party/icu/public/i18n/unicode/datefmt.h"
#include "third_party/icu/public/i18n/unicode/dtfmtsym.h"
Expand Down
2 changes: 1 addition & 1 deletion net/ftp/ftp_util_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"

namespace {
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_cache_transaction.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions net/http/http_cache_transaction.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

#include <string>

#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 {
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_network_transaction.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_proxy_client_socket_pool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <algorithm>

#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"
Expand Down
4 changes: 2 additions & 2 deletions net/http/http_proxy_client_socket_pool.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion net/http/http_response_body_drainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_response_headers.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_response_headers_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_response_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_response_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <string>

#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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_security_headers.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_transaction_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/http_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion net/http/transport_security_state.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/http/transport_security_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/ocsp/nss_ocsp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "base/time.h"
#include "base/time/time.h"
#include "googleurl/src/gurl.h"
#include "net/base/host_port_pair.h"
#include "net/base/io_buffer.h"
Expand Down
Loading

0 comments on commit 66e96c4

Please sign in to comment.