summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_sync_channel_unittest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index b1d2401..c98d691 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -977,8 +977,7 @@ TEST_F(IPCSyncChannelTest, SendWithTimeoutTimeout) {
}
// Sends some message that time-out and some that succeed.
-// Crashes flakily, http://crbug.com/70075.
-TEST_F(IPCSyncChannelTest, DISABLED_SendWithTimeoutMixedOKAndTimeout) {
+TEST_F(IPCSyncChannelTest, SendWithTimeoutMixedOKAndTimeout) {
SendWithTimeoutMixedOKAndTimeout(false);
SendWithTimeoutMixedOKAndTimeout(true);
}
@@ -1879,9 +1878,6 @@ void Verified() {
workers.push_back(worker);
RunTest(workers);
-
-#if defined(OS_WIN)
-#endif
}
// Windows needs to send an out-of-band secret to verify the client end of the