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

Unified Diff: mojo/edk/system/ipc_support_unittest.cc

Issue 1430593005: EDK: Remove (direct) dependencies of //mojo/edk/system on //base/test. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 months 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/endpoint_relayer_unittest.cc ('k') | mojo/edk/system/message_pipe_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/ipc_support_unittest.cc
diff --git a/mojo/edk/system/ipc_support_unittest.cc b/mojo/edk/system/ipc_support_unittest.cc
index 2ca97a601f00c1388b7cadd041889074da8e9703..9ced02e0e1ef6634f9e581f275755951dc293696 100644
--- a/mojo/edk/system/ipc_support_unittest.cc
+++ b/mojo/edk/system/ipc_support_unittest.cc
@@ -12,7 +12,7 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/synchronization/waitable_event.h"
-#include "base/test/test_timeouts.h"
+#include "base/time/time.h"
#include "mojo/edk/embedder/master_process_delegate.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/edk/embedder/simple_platform_support.h"
@@ -125,7 +125,9 @@ class TestMasterProcessDelegate : public embedder::MasterProcessDelegate {
// Warning: There's only one slave disconnect event (which resets
// automatically).
bool TryWaitForOnSlaveDisconnect() {
- return on_slave_disconnect_event_.TimedWait(TestTimeouts::action_timeout());
+ return on_slave_disconnect_event_.TimedWait(
+ base::TimeDelta::FromMicroseconds(
+ static_cast<int64_t>(test::ActionTimeout())));
}
private:
@@ -184,7 +186,8 @@ class TestSlaveConnection {
}
void WaitForChannelToSlave() {
- EXPECT_TRUE(event_.TimedWait(TestTimeouts::action_timeout()));
+ EXPECT_TRUE(event_.TimedWait(base::TimeDelta::FromMicroseconds(
+ static_cast<int64_t>(test::ActionTimeout()))));
}
void ShutdownChannelToSlave() {
@@ -249,7 +252,8 @@ class TestSlave {
}
void WaitForChannelToMaster() {
- EXPECT_TRUE(event_.TimedWait(TestTimeouts::action_timeout()));
+ EXPECT_TRUE(event_.TimedWait(base::TimeDelta::FromMicroseconds(
+ static_cast<int64_t>(test::ActionTimeout()))));
}
void ShutdownChannelToMaster() {
« no previous file with comments | « mojo/edk/system/endpoint_relayer_unittest.cc ('k') | mojo/edk/system/message_pipe_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698