summaryrefslogtreecommitdiffstats
path: root/base/threading
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-02 06:05:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-02 06:05:39 +0000
commit44f9c950c66c18b205f1dd56a793693899b5057a (patch)
tree4d742f4838732d42bd7f536f8440df7aa0bbbcbf /base/threading
parentf2bcc90abc6c33292592b17351973600b51e9b62 (diff)
downloadchromium_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 'base/threading')
-rw-r--r--base/threading/simple_thread.h2
-rw-r--r--base/threading/simple_thread_unittest.cc2
-rw-r--r--base/threading/thread.cc2
-rw-r--r--base/threading/thread_local_unittest.cc2
-rw-r--r--base/threading/worker_pool_posix_unittest.cc2
-rw-r--r--base/threading/worker_pool_unittest.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/base/threading/simple_thread.h b/base/threading/simple_thread.h
index c401e01..b107e9c 100644
--- a/base/threading/simple_thread.h
+++ b/base/threading/simple_thread.h
@@ -48,7 +48,7 @@
#include "base/basictypes.h"
#include "base/lock.h"
#include "base/threading/platform_thread.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
namespace base {
diff --git a/base/threading/simple_thread_unittest.cc b/base/threading/simple_thread_unittest.cc
index 56aed6b..4014d70 100644
--- a/base/threading/simple_thread_unittest.cc
+++ b/base/threading/simple_thread_unittest.cc
@@ -5,7 +5,7 @@
#include "base/atomic_sequence_num.h"
#include "base/string_number_conversions.h"
#include "base/threading/simple_thread.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/threading/thread.cc b/base/threading/thread.cc
index 5772d32..09f8847 100644
--- a/base/threading/thread.cc
+++ b/base/threading/thread.cc
@@ -7,7 +7,7 @@
#include "base/lazy_instance.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "base/threading/thread_local.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
namespace base {
diff --git a/base/threading/thread_local_unittest.cc b/base/threading/thread_local_unittest.cc
index f6bdd78..ba12898 100644
--- a/base/threading/thread_local_unittest.cc
+++ b/base/threading/thread_local_unittest.cc
@@ -5,7 +5,7 @@
#include "base/logging.h"
#include "base/threading/simple_thread.h"
#include "base/threading/thread_local.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/threading/worker_pool_posix_unittest.cc b/base/threading/worker_pool_posix_unittest.cc
index 9be82c0..332c55e 100644
--- a/base/threading/worker_pool_posix_unittest.cc
+++ b/base/threading/worker_pool_posix_unittest.cc
@@ -10,7 +10,7 @@
#include "base/synchronization/condition_variable.h"
#include "base/task.h"
#include "base/threading/platform_thread.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc
index cf8e0e8..f044e10 100644
--- a/base/threading/worker_pool_unittest.cc
+++ b/base/threading/worker_pool_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/task.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "base/threading/worker_pool.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"