Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1056)

Unified Diff: mojo/edk/system/test/test_io_thread.cc

Issue 1420713006: Revert "EDK: Move //mojo/edk/system/waitable_event* to edk/util." (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/system/test/test_io_thread.h ('k') | mojo/edk/system/test_channel_endpoint_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/test/test_io_thread.cc
diff --git a/mojo/edk/system/test/test_io_thread.cc b/mojo/edk/system/test/test_io_thread.cc
index 48e5c71037e4c91debd65bfe1ddab25f21312b60..ee11ff3f94fdb7c10460642292c7433df84ea25f 100644
--- a/mojo/edk/system/test/test_io_thread.cc
+++ b/mojo/edk/system/test/test_io_thread.cc
@@ -7,9 +7,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/location.h"
-#include "mojo/edk/util/waitable_event.h"
-
-using mojo::util::AutoResetWaitableEvent;
+#include "base/synchronization/waitable_event.h"
namespace mojo {
namespace system {
@@ -17,7 +15,7 @@ namespace test {
namespace {
-void PostTaskAndWaitHelper(AutoResetWaitableEvent* event,
+void PostTaskAndWaitHelper(base::WaitableEvent* event,
const base::Closure& task) {
task.Run();
event->Signal();
@@ -59,7 +57,7 @@ void TestIOThread::PostTask(const base::Closure& task) {
}
void TestIOThread::PostTaskAndWait(const base::Closure& task) {
- AutoResetWaitableEvent event;
+ base::WaitableEvent event(false, false);
task_runner()->PostTask(tracked_objects::Location(),
base::Bind(&PostTaskAndWaitHelper, &event, task));
event.Wait();
« no previous file with comments | « mojo/edk/system/test/test_io_thread.h ('k') | mojo/edk/system/test_channel_endpoint_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698