diff options
Diffstat (limited to 'net')
23 files changed, 25 insertions, 24 deletions
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc index 61a2d65..fd36132 100644 --- a/net/base/directory_lister.cc +++ b/net/base/directory_lister.cc @@ -11,7 +11,7 @@ #include "base/i18n/file_util_icu.h" #include "base/message_loop.h" #include "base/platform_thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "net/base/net_errors.h" namespace net { diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index 10ccc95..69a722e 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -12,7 +12,7 @@ #include "base/nss_util.h" #include "base/task.h" #include "base/threading/worker_pool.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h index 6658d91..176dfcb 100644 --- a/net/base/listen_socket_unittest.h +++ b/net/base/listen_socket_unittest.h @@ -22,7 +22,7 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/listen_socket.h" #include "net/base/net_util.h" #include "net/base/winsock_init.h" diff --git a/net/base/network_change_notifier_linux.cc b/net/base/network_change_notifier_linux.cc index 1db4bd1..c19d182 100644 --- a/net/base/network_change_notifier_linux.cc +++ b/net/base/network_change_notifier_linux.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/eintr_wrapper.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/net_errors.h" #include "net/base/network_change_notifier_netlink_linux.h" @@ -91,7 +91,8 @@ void NetworkChangeNotifierLinux::Thread::OnFileCanReadWithoutBlocking(int fd) { ListenForNotifications(); } -void NetworkChangeNotifierLinux::Thread::OnFileCanWriteWithoutBlocking(int /* fd */) { +void NetworkChangeNotifierLinux::Thread::OnFileCanWriteWithoutBlocking( + int /* fd */) { NOTREACHED(); } diff --git a/net/base/network_config_watcher_mac.cc b/net/base/network_config_watcher_mac.cc index dd93067..afec17d 100644 --- a/net/base/network_config_watcher_mac.cc +++ b/net/base/network_config_watcher_mac.cc @@ -9,7 +9,7 @@ #include <algorithm> #include "base/compiler_specific.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/mac/scoped_cftyperef.h" namespace net { diff --git a/net/base/ssl_config_service_win.cc b/net/base/ssl_config_service_win.cc index aca0626..ca20e79 100644 --- a/net/base/ssl_config_service_win.cc +++ b/net/base/ssl_config_service_win.cc @@ -4,7 +4,7 @@ #include "net/base/ssl_config_service_win.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/win/registry.h" using base::TimeDelta; diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc index 4eab2675..96ef7b01 100644 --- a/net/disk_cache/backend_impl.cc +++ b/net/disk_cache/backend_impl.cc @@ -14,7 +14,7 @@ #include "base/stringprintf.h" #include "base/sys_info.h" #include "base/threading/worker_pool.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/timer.h" #include "net/base/net_errors.h" diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc index c86955f..241fc04 100644 --- a/net/disk_cache/disk_cache_perftest.cc +++ b/net/disk_cache/disk_cache_perftest.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/perftimer.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/test/test_file_util.h" #include "base/timer.h" #include "net/base/io_buffer.h" diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h index faecc17..13b3879 100644 --- a/net/disk_cache/disk_cache_test_base.h +++ b/net/disk_cache/disk_cache_test_base.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/cache_type.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc index ae2f981..6658dc8 100644 --- a/net/disk_cache/stress_cache.cc +++ b/net/disk_cache/stress_cache.cc @@ -36,7 +36,7 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc index c492b1b..9a69ec3 100644 --- a/net/http/http_auth_gssapi_posix.cc +++ b/net/http/http_auth_gssapi_posix.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/net/proxy/multi_threaded_proxy_resolver.cc b/net/proxy/multi_threaded_proxy_resolver.cc index 6c348d2..ad1228c 100644 --- a/net/proxy/multi_threaded_proxy_resolver.cc +++ b/net/proxy/multi_threaded_proxy_resolver.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/proxy/proxy_info.h" diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index 2cb1259..f333027 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -15,7 +15,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_common_unittest.h" diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc index 5aca4ae..914a319 100644 --- a/net/proxy/proxy_config_service_win.cc +++ b/net/proxy/proxy_config_service_win.cc @@ -12,7 +12,7 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stl_util-inl.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/win/registry.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_config.h" diff --git a/net/proxy/sync_host_resolver_bridge_unittest.cc b/net/proxy/sync_host_resolver_bridge_unittest.cc index 43c829f..712234d 100644 --- a/net/proxy/sync_host_resolver_bridge_unittest.cc +++ b/net/proxy/sync_host_resolver_bridge_unittest.cc @@ -4,7 +4,7 @@ #include "net/proxy/sync_host_resolver_bridge.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index eb8bafb..1ad1f1c 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/nss_util.h" #include "base/singleton.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/values.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 49e065f..ee80ca5 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -68,7 +68,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/values.h" #include "net/base/address_list.h" #include "net/base/cert_status_flags.h" diff --git a/net/test/test_server_win.cc b/net/test/test_server_win.cc index e38d0bc..075b484 100644 --- a/net/test/test_server_win.cc +++ b/net/test/test_server_win.cc @@ -15,7 +15,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/test/test_timeouts.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #pragma comment(lib, "crypt32.lib") diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc index 88d7d87..44672ed 100644 --- a/net/tools/crash_cache/crash_cache.cc +++ b/net/tools/crash_cache/crash_cache.cc @@ -18,7 +18,7 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/net/tools/dump_cache/upgrade.cc b/net/tools/dump_cache/upgrade.cc index 0d6d5e4..30fbc8c6 100644 --- a/net/tools/dump_cache/upgrade.cc +++ b/net/tools/dump_cache/upgrade.cc @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" diff --git a/net/tools/hresolv/hresolv.cc b/net/tools/hresolv/hresolv.cc index 314ff32..16124d7 100644 --- a/net/tools/hresolv/hresolv.cc +++ b/net/tools/hresolv/hresolv.cc @@ -31,7 +31,7 @@ #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index d7ebe0a..adc6f44 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -24,7 +24,7 @@ #include "base/platform_file.h" #include "base/string_util.h" #include "base/threading/worker_pool.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index 50236fd..b13d268 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -17,7 +17,7 @@ #include "base/process_util.h" #include "base/string_util.h" #include "base/string16.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "net/base/cert_verifier.h" |