diff options
Diffstat (limited to 'net/base')
25 files changed, 32 insertions, 15 deletions
diff --git a/net/base/bzip2_filter_unittest.cc b/net/base/bzip2_filter_unittest.cc index a7023c1..9b1eab5 100644 --- a/net/base/bzip2_filter_unittest.cc +++ b/net/base/bzip2_filter_unittest.cc @@ -10,6 +10,7 @@ #include "base/scoped_ptr.h" #include "net/base/bzip2_filter.h" #include "net/base/filter_unittest.h" +#include "net/base/io_buffer.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "third_party/bzip2/bzlib.h" diff --git a/net/base/dns_resolution_observer.h b/net/base/dns_resolution_observer.h index f01eaf2..9dd9a90 100644 --- a/net/base/dns_resolution_observer.h +++ b/net/base/dns_resolution_observer.h @@ -15,7 +15,7 @@ #include <string> -#include "googleurl/src/gurl.h" +class GURL; namespace net { diff --git a/net/base/file_stream.h b/net/base/file_stream.h index 807ea55..6b7f3dc 100644 --- a/net/base/file_stream.h +++ b/net/base/file_stream.h @@ -10,11 +10,12 @@ #ifndef NET_BASE_FILE_STREAM_H_ #define NET_BASE_FILE_STREAM_H_ -#include "base/file_path.h" #include "base/platform_file.h" #include "base/scoped_ptr.h" #include "net/base/completion_callback.h" +class FilePath; + namespace net { // TODO(darin): Move this to a more generic location. diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index 8fca162..7bc685c 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -15,6 +15,7 @@ #include "base/basictypes.h" #include "base/eintr_wrapper.h" +#include "base/file_path.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 93a3fd9..caa636f 100644 --- a/net/base/file_stream_win.cc +++ b/net/base/file_stream_win.cc @@ -6,6 +6,7 @@ #include <windows.h> +#include "base/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "net/base/net_errors.h" diff --git a/net/base/filter.cc b/net/base/filter.cc index d12124c..ceae763 100644 --- a/net/base/filter.cc +++ b/net/base/filter.cc @@ -8,6 +8,7 @@ #include "base/string_util.h" #include "net/base/gzip_filter.h" #include "net/base/bzip2_filter.h" +#include "net/base/io_buffer.h" #include "net/base/sdch_filter.h" namespace { diff --git a/net/base/filter.h b/net/base/filter.h index 295d80f..cb28031 100644 --- a/net/base/filter.h +++ b/net/base/filter.h @@ -33,12 +33,17 @@ #include <vector> #include "base/basictypes.h" +#include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "net/base/io_buffer.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest_prod.h" +class GURL; + +namespace net { +class IOBuffer; +} + //------------------------------------------------------------------------------ // Define an interface class that allows access to contextual information // supplied by the owner of this filter. In the case where there are a chain of diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc index 74fbc2b..5d1b9c5 100644 --- a/net/base/gzip_filter_unittest.cc +++ b/net/base/gzip_filter_unittest.cc @@ -8,8 +8,9 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_ptr.h" -#include "net/base/gzip_filter.h" #include "net/base/filter_unittest.h" +#include "net/base/gzip_filter.h" +#include "net/base/io_buffer.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "third_party/zlib/zlib.h" diff --git a/net/base/listen_socket.h b/net/base/listen_socket.h index cadc962..17fa50d 100644 --- a/net/base/listen_socket.h +++ b/net/base/listen_socket.h @@ -11,6 +11,8 @@ #ifndef NET_BASE_LISTEN_SOCKET_H_ #define NET_BASE_LISTEN_SOCKET_H_ +#include "build/build_config.h" + #if defined(OS_WIN) #include <winsock2.h> #endif @@ -19,8 +21,6 @@ #include "base/object_watcher.h" #elif defined(OS_POSIX) #include "base/message_loop.h" -#include "net/base/net_util.h" -#include "net/base/net_errors.h" #endif #include "base/basictypes.h" diff --git a/net/base/net_module.h b/net/base/net_module.h index fa9c965..06404d0 100644 --- a/net/base/net_module.h +++ b/net/base/net_module.h @@ -5,8 +5,6 @@ #ifndef NET_BASE_NET_MODULE_H__ #define NET_BASE_NET_MODULE_H__ -#include <string> - #include "base/basictypes.h" #include "base/string_piece.h" diff --git a/net/base/sdch_filter.h b/net/base/sdch_filter.h index 012de89..20a3b6e 100644 --- a/net/base/sdch_filter.h +++ b/net/base/sdch_filter.h @@ -15,10 +15,8 @@ #define NET_BASE_SDCH_FILTER_H_ #include <string> -#include <vector> #include "base/scoped_ptr.h" -#include "base/time.h" #include "net/base/filter.h" #include "net/base/sdch_manager.h" diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc index 532bba6..abab262 100644 --- a/net/base/sdch_filter_unittest.cc +++ b/net/base/sdch_filter_unittest.cc @@ -12,6 +12,7 @@ #include "base/scoped_ptr.h" #include "net/base/filter.h" #include "net/base/filter_unittest.h" +#include "net/base/io_buffer.h" #include "net/base/sdch_filter.h" #include "net/url_request/url_request_http_job.cc" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/socket.h b/net/base/socket.h index 843104b..b03b6c2 100644 --- a/net/base/socket.h +++ b/net/base/socket.h @@ -6,10 +6,11 @@ #define NET_BASE_SOCKET_H_ #include "net/base/completion_callback.h" -#include "net/base/io_buffer.h" namespace net { +class IOBuffer; + // Represents a read/write socket. class Socket { public: diff --git a/net/base/socket_test_util.cc b/net/base/socket_test_util.cc index de21c81..fa7f63e 100644 --- a/net/base/socket_test_util.cc +++ b/net/base/socket_test_util.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/message_loop.h" +#include "net/base/io_buffer.h" #include "net/base/socket.h" #include "net/base/ssl_client_socket.h" #include "net/base/ssl_info.h" diff --git a/net/base/ssl_client_socket_mac.cc b/net/base/ssl_client_socket_mac.cc index 2d68771..2148a2b 100644 --- a/net/base/ssl_client_socket_mac.cc +++ b/net/base/ssl_client_socket_mac.cc @@ -6,6 +6,7 @@ #include "base/singleton.h" #include "base/string_util.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/ssl_info.h" diff --git a/net/base/ssl_client_socket_nss.cc b/net/base/ssl_client_socket_nss.cc index 12ef11e..ec2b961 100644 --- a/net/base/ssl_client_socket_nss.cc +++ b/net/base/ssl_client_socket_nss.cc @@ -66,6 +66,7 @@ #include "base/logging.h" #include "base/nss_init.h" #include "base/string_util.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/ssl_info.h" diff --git a/net/base/ssl_client_socket_unittest.cc b/net/base/ssl_client_socket_unittest.cc index 324f3b6..d372e95 100644 --- a/net/base/ssl_client_socket_unittest.cc +++ b/net/base/ssl_client_socket_unittest.cc @@ -5,6 +5,7 @@ #include "net/base/address_list.h" #include "net/base/client_socket_factory.h" #include "net/base/host_resolver.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/ssl_client_socket.h" #include "net/base/ssl_config_service.h" diff --git a/net/base/ssl_client_socket_win.cc b/net/base/ssl_client_socket_win.cc index 62790d5..7c76b99 100644 --- a/net/base/ssl_client_socket_win.cc +++ b/net/base/ssl_client_socket_win.cc @@ -10,6 +10,7 @@ #include "base/singleton.h" #include "base/string_util.h" #include "net/base/connection_type_histograms.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/ssl_info.h" diff --git a/net/base/ssl_info.h b/net/base/ssl_info.h index 4c661b2..203b6de 100644 --- a/net/base/ssl_info.h +++ b/net/base/ssl_info.h @@ -6,7 +6,6 @@ #define NET_BASE_SSL_INFO_H_ #include "net/base/cert_status_flags.h" -#include "net/base/net_errors.h" #include "net/base/x509_certificate.h" namespace net { diff --git a/net/base/tcp_client_socket_libevent.cc b/net/base/tcp_client_socket_libevent.cc index e011100..7d42e4a 100644 --- a/net/base/tcp_client_socket_libevent.cc +++ b/net/base/tcp_client_socket_libevent.cc @@ -13,6 +13,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/trace_event.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "third_party/libevent/event.h" diff --git a/net/base/tcp_client_socket_unittest.cc b/net/base/tcp_client_socket_unittest.cc index abd1c0d..9dad6e2 100644 --- a/net/base/tcp_client_socket_unittest.cc +++ b/net/base/tcp_client_socket_unittest.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "net/base/address_list.h" #include "net/base/host_resolver.h" +#include "net/base/io_buffer.h" #include "net/base/listen_socket.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/net/base/tcp_client_socket_win.cc b/net/base/tcp_client_socket_win.cc index 7151aca..d073485 100644 --- a/net/base/tcp_client_socket_win.cc +++ b/net/base/tcp_client_socket_win.cc @@ -10,6 +10,7 @@ #include "base/string_util.h" #include "base/sys_info.h" #include "base/trace_event.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/winsock_init.h" diff --git a/net/base/upload_data.h b/net/base/upload_data.h index 56a1339..f1d4369 100644 --- a/net/base/upload_data.h +++ b/net/base/upload_data.h @@ -5,7 +5,6 @@ #ifndef NET_BASE_UPLOAD_DATA_H_ #define NET_BASE_UPLOAD_DATA_H_ -#include <string> #include <vector> #include "base/file_path.h" diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc index 468ef6b..7a97846 100644 --- a/net/base/upload_data_stream.cc +++ b/net/base/upload_data_stream.cc @@ -5,6 +5,7 @@ #include "net/base/upload_data_stream.h" #include "base/logging.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" namespace net { diff --git a/net/base/upload_data_stream.h b/net/base/upload_data_stream.h index e65d08b..d703c3d 100644 --- a/net/base/upload_data_stream.h +++ b/net/base/upload_data_stream.h @@ -6,11 +6,12 @@ #define NET_BASE_UPLOAD_DATA_STREAM_H_ #include "net/base/file_stream.h" -#include "net/base/io_buffer.h" #include "net/base/upload_data.h" namespace net { +class IOBuffer; + class UploadDataStream { public: explicit UploadDataStream(const UploadData* data); |