summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-12 19:35:27 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-12 19:35:27 +0000
commit597f1b82051238962c0d15ad716851465496b30a (patch)
tree069e877cc96990d89dae60152af8ca1fa58ad335 /ipc
parenta99795043a290bbb4ec92068e3d9c68f6ebd15fd (diff)
downloadchromium_src-597f1b82051238962c0d15ad716851465496b30a.zip
chromium_src-597f1b82051238962c0d15ad716851465496b30a.tar.gz
chromium_src-597f1b82051238962c0d15ad716851465496b30a.tar.bz2
Reenable IPCSyncChannelTest.SendWithTimeoutMixedOKAndTimeout
This is speculative: I fixed crbug.com/25841, and hope that that's the underlying cause for crbug.com/70075 (flakiness on Windows). Or maybe the cause was something else that has also since gone away (since the test was reliable for a long time before). BUG=70075 Review URL: https://chromiumcodereview.appspot.com/11861018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176578 0039d316-1c4b-4281-b951-d872f2087c98
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