diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-02 06:05:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-02 06:05:39 +0000 |
| commit | 44f9c950c66c18b205f1dd56a793693899b5057a (patch) | |
| tree | 4d742f4838732d42bd7f536f8440df7aa0bbbcbf /net/proxy | |
| parent | f2bcc90abc6c33292592b17351973600b51e9b62 (diff) | |
| download | chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.zip chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.tar.gz chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.tar.bz2 | |
Move CancellationFlag and WaitableEvent to the synchronization subdirectory.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/5977010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/multi_threaded_proxy_resolver_unittest.cc | 2 | ||||
| -rw-r--r-- | net/proxy/proxy_config_service_linux_unittest.cc | 2 | ||||
| -rw-r--r-- | net/proxy/proxy_service.h | 2 | ||||
| -rw-r--r-- | net/proxy/sync_host_resolver_bridge.cc | 2 | ||||
| -rw-r--r-- | net/proxy/sync_host_resolver_bridge_unittest.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc index 8f787f4..78409e5 100644 --- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc @@ -9,7 +9,7 @@ #include "base/stringprintf.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index f333027..3005326d 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -16,7 +16,7 @@ #include "base/stringprintf.h" #include "base/task.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_common_unittest.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index ba56f4d6..131c98c 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/completion_callback.h" #include "net/base/network_change_notifier.h" #include "net/base/net_log.h" diff --git a/net/proxy/sync_host_resolver_bridge.cc b/net/proxy/sync_host_resolver_bridge.cc index bcb05d6..37a847f 100644 --- a/net/proxy/sync_host_resolver_bridge.cc +++ b/net/proxy/sync_host_resolver_bridge.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/lock.h" #include "base/message_loop.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/proxy/sync_host_resolver_bridge_unittest.cc b/net/proxy/sync_host_resolver_bridge_unittest.cc index 712234d..5cb053ec 100644 --- a/net/proxy/sync_host_resolver_bridge_unittest.cc +++ b/net/proxy/sync_host_resolver_bridge_unittest.cc @@ -5,7 +5,7 @@ #include "net/proxy/sync_host_resolver_bridge.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" |