summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/automation/automation_proxy.cc2
-rw-r--r--chrome/test/automation/automation_proxy.h2
-rw-r--r--chrome/test/live_sync/live_sessions_sync_test.h2
-rw-r--r--chrome/test/live_sync/live_sync_test.cc2
-rw-r--r--chrome/test/signaling_task.h2
-rw-r--r--chrome/test/testing_browser_process.h2
-rw-r--r--chrome/test/thread_observer_helper.h2
-rw-r--r--chrome/test/thread_test_helper.h2
8 files changed, 8 insertions, 8 deletions
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 1138cc4..18ddc3e 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -13,7 +13,7 @@
#include "base/threading/platform_thread.h"
#include "base/process_util.h"
#include "base/ref_counted.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/common/automation_constants.h"
#include "chrome/common/automation_messages.h"
#include "chrome/common/chrome_version_info.h"
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index 1852c49..d1dcf19 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -17,7 +17,7 @@
#include "base/scoped_ptr.h"
#include "base/time.h"
#include "base/threading/thread.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/automation_constants.h"
#include "chrome/test/automation/automation_handle_tracker.h"
diff --git a/chrome/test/live_sync/live_sessions_sync_test.h b/chrome/test/live_sync/live_sessions_sync_test.h
index 03fea8c..b08ef7d4 100644
--- a/chrome/test/live_sync/live_sessions_sync_test.h
+++ b/chrome/test/live_sync/live_sessions_sync_test.h
@@ -12,7 +12,7 @@
#include "base/compiler_specific.h"
#include "base/scoped_vector.h"
#include "base/ref_counted.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/render_view_host_delegate.h"
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index 9a3d125..1eca8aa 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -16,7 +16,7 @@
#include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h"
#include "base/values.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/password_manager/encryptor.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/test/signaling_task.h b/chrome/test/signaling_task.h
index 23063e1..c745393 100644
--- a/chrome/test/signaling_task.h
+++ b/chrome/test/signaling_task.h
@@ -8,7 +8,7 @@
#define CHROME_TEST_SIGNALING_TASK_H_
#pragma once
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
using base::WaitableEvent;
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index 6c9d52d1..5ae0a5c 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -17,7 +17,7 @@
#include "app/clipboard/clipboard.h"
#include "base/string_util.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/google/google_url_tracker.h"
#include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/test/thread_observer_helper.h b/chrome/test/thread_observer_helper.h
index 2987437..5186b06 100644
--- a/chrome/test/thread_observer_helper.h
+++ b/chrome/test/thread_observer_helper.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/ref_counted.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/common/notification_observer_mock.h"
#include "chrome/common/notification_registrar.h"
diff --git a/chrome/test/thread_test_helper.h b/chrome/test/thread_test_helper.h
index a1350bd6..93960e1 100644
--- a/chrome/test/thread_test_helper.h
+++ b/chrome/test/thread_test_helper.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/ref_counted.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/browser/browser_thread.h"
// Helper class that executes code on a given thread while blocking on the