diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 01:01:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 01:01:06 +0000 |
| commit | 34b9963c187a733bef76535521f3de688fffd34f (patch) | |
| tree | a0569030e3a2ecc5b9c88d31a2469a380de85346 /net/base | |
| parent | 1a2a571b157327f75acd56bd594ef0863481dc32 (diff) | |
| download | chromium_src-34b9963c187a733bef76535521f3de688fffd34f.zip chromium_src-34b9963c187a733bef76535521f3de688fffd34f.tar.gz chromium_src-34b9963c187a733bef76535521f3de688fffd34f.tar.bz2 | |
Move base/thread.h to base/threading, fix up callers to use the new location.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6028009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/directory_lister.cc | 2 | ||||
| -rw-r--r-- | net/base/keygen_handler_unittest.cc | 2 | ||||
| -rw-r--r-- | net/base/listen_socket_unittest.h | 2 | ||||
| -rw-r--r-- | net/base/network_change_notifier_linux.cc | 5 | ||||
| -rw-r--r-- | net/base/network_config_watcher_mac.cc | 2 | ||||
| -rw-r--r-- | net/base/ssl_config_service_win.cc | 2 |
6 files changed, 8 insertions, 7 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; |