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

10 files changed, 10 insertions, 10 deletions

diff --git a/net/base/directory_lister.h b/net/base/directory_lister.h
index 3419daa..368c783 100644
--- a/net/base/directory_lister.h
+++ b/net/base/directory_lister.h
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "base/cancellation_flag.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/ref_counted.h"
+#include "base/synchronization/cancellation_flag.h"
 #include "base/task.h"
 #include "base/threading/platform_thread.h"
 
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc
index 887d9c1..21abd20 100644
--- a/net/base/file_stream_posix.cc
+++ b/net/base/file_stream_posix.cc
@@ -22,7 +22,7 @@
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/threading/worker_pool.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
 #include "net/base/net_errors.h"
 
 // We cast back and forth, so make sure it's the size we're expecting.
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
index 69a722e..ee60cee 100644
--- a/net/base/keygen_handler_unittest.cc
+++ b/net/base/keygen_handler_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/task.h"
 #include "base/threading/worker_pool.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_NSS)
diff --git a/net/base/mock_host_resolver.h b/net/base/mock_host_resolver.h
index e5b8694..2972c84 100644
--- a/net/base/mock_host_resolver.h
+++ b/net/base/mock_host_resolver.h
@@ -8,7 +8,7 @@
 
 #include <list>
 
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
 #include "net/base/host_resolver_impl.h"
 #include "net/base/host_resolver_proc.h"
 
diff --git a/net/disk_cache/in_flight_io.h b/net/disk_cache/in_flight_io.h
index 6c5f8ab..a361cbd 100644
--- a/net/disk_cache/in_flight_io.h
+++ b/net/disk_cache/in_flight_io.h
@@ -9,7 +9,7 @@
 #include <set>
 
 #include "base/message_loop_proxy.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
 
 namespace disk_cache {
 
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"