From a91e1409a1b702892be19b058ad418b92ab4dd28 Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Wed, 14 Jul 2010 18:15:28 +0000 Subject: Reland r52336. (I accidentally committed a previous version of the patch (the fixed version was in codereview since I had switched to my mac to address this exact compile failure.) BUG=none TEST=none TBR=evan Review URL: http://codereview.chromium.org/2937010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52349 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/capturing_net_log.h | 1 + net/base/file_stream_posix.cc | 1 + net/base/file_stream_win.cc | 1 + net/base/host_resolver_impl.cc | 1 + net/base/listen_socket_unittest.h | 1 + net/base/net_log.cc | 1 + net/base/net_log.h | 6 ++++-- net/base/net_util.cc | 1 + net/http/http_auth_handler.h | 1 + net/proxy/proxy_service.cc | 1 + net/server/http_listen_socket.cc | 2 ++ net/server/http_server_request_info.h | 1 + net/tools/fetch/http_listen_socket.cc | 5 ++++- net/tools/fetch/http_server_request_info.h | 1 + net/url_request/url_request.h | 2 -- net/url_request/url_request_job.cc | 1 + 16 files changed, 22 insertions(+), 5 deletions(-) (limited to 'net') diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h index 2f95f7c..cad2d26 100644 --- a/net/base/capturing_net_log.h +++ b/net/base/capturing_net_log.h @@ -10,6 +10,7 @@ #include "base/basictypes.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "base/time.h" #include "net/base/net_log.h" namespace net { diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index 2036260..ba91db2 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -17,6 +17,7 @@ #include "base/callback.h" #include "base/eintr_wrapper.h" #include "base/file_path.h" +#include "base/histogram.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc index 8b7f090..a50e7aa 100644 --- a/net/base/file_stream_win.cc +++ b/net/base/file_stream_win.cc @@ -7,6 +7,7 @@ #include #include "base/file_path.h" +#include "base/histogram.h" #include "base/logging.h" #include "base/message_loop.h" #include "net/base/net_errors.h" diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc index 5685fc4..9b19436 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/base/host_resolver_impl.cc @@ -17,6 +17,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/debug_util.h" +#include "base/histogram.h" #include "base/lock.h" #include "base/message_loop.h" #include "base/stl_util-inl.h" diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h index 7adea1e..d43364a 100644 --- a/net/base/listen_socket_unittest.h +++ b/net/base/listen_socket_unittest.h @@ -16,6 +16,7 @@ #include #endif +#include "base/scoped_ptr.h" #include "base/thread.h" #include "base/basictypes.h" #include "base/message_loop.h" diff --git a/net/base/net_log.cc b/net/base/net_log.cc index ace4a53..bd62f91 100644 --- a/net/base/net_log.cc +++ b/net/base/net_log.cc @@ -4,6 +4,7 @@ #include "net/base/net_log.h" #include "base/string_util.h" +#include "base/time.h" #include "base/values.h" namespace net { diff --git a/net/base/net_log.h b/net/base/net_log.h index 2f82ed4..266b93a 100644 --- a/net/base/net_log.h +++ b/net/base/net_log.h @@ -10,11 +10,13 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "base/scoped_ptr.h" -#include "base/time.h" class Value; +namespace base { +class TimeTicks; +} + namespace net { // NetLog is the destination for log messages generated by the network stack. diff --git a/net/base/net_util.cc b/net/base/net_util.cc index f60afcc..c7b6a6f 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -33,6 +33,7 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/histogram.h" #include "base/i18n/file_util_icu.h" #include "base/i18n/icu_string_conversions.h" #include "base/i18n/time_formatting.h" diff --git a/net/http/http_auth_handler.h b/net/http/http_auth_handler.h index f919898..ad8c939 100644 --- a/net/http/http_auth_handler.h +++ b/net/http/http_auth_handler.h @@ -7,6 +7,7 @@ #include +#include "base/time.h" #include "net/base/completion_callback.h" #include "net/base/net_log.h" #include "net/http/http_auth.h" diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 5dee33c..a613f6a9 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -8,6 +8,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/histogram.h" #include "base/message_loop.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" diff --git a/net/server/http_listen_socket.cc b/net/server/http_listen_socket.cc index 7711cd6..16c664e 100644 --- a/net/server/http_listen_socket.cc +++ b/net/server/http_listen_socket.cc @@ -8,6 +8,8 @@ #include #endif +#include + #include "base/compiler_specific.h" #include "base/logging.h" #include "base/md5.h" diff --git a/net/server/http_server_request_info.h b/net/server/http_server_request_info.h index 64f0a78a..84f767f 100644 --- a/net/server/http_server_request_info.h +++ b/net/server/http_server_request_info.h @@ -6,6 +6,7 @@ #define NET_SERVER_HTTP_SERVER_REQUEST_INFO_H_ #include +#include #include "net/http/http_request_info.h" diff --git a/net/tools/fetch/http_listen_socket.cc b/net/tools/fetch/http_listen_socket.cc index e135322..d0d6b97 100644 --- a/net/tools/fetch/http_listen_socket.cc +++ b/net/tools/fetch/http_listen_socket.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "net/tools/fetch/http_listen_socket.h" + +#include + #include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "net/tools/fetch/http_listen_socket.h" #include "net/tools/fetch/http_server_request_info.h" #include "net/tools/fetch/http_server_response_info.h" diff --git a/net/tools/fetch/http_server_request_info.h b/net/tools/fetch/http_server_request_info.h index 239d3b9..fb45bdb 100644 --- a/net/tools/fetch/http_server_request_info.h +++ b/net/tools/fetch/http_server_request_info.h @@ -5,6 +5,7 @@ #ifndef NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_ #define NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_ +#include #include #include "net/http/http_request_info.h" diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 59aa9c4..7256ec0 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -10,12 +10,10 @@ #include #include "base/leak_tracker.h" -#include "base/linked_list.h" #include "base/linked_ptr.h" #include "base/logging.h" #include "base/non_thread_safe.h" #include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "net/base/load_states.h" #include "net/base/net_log.h" diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index 486d8c0..4e737ba 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc @@ -4,6 +4,7 @@ #include "net/url_request/url_request_job.h" +#include "base/histogram.h" #include "base/message_loop.h" #include "base/string_util.h" #include "net/base/auth.h" -- cgit v1.1