| Index: base/synchronization/condition_variable_unittest.cc
|
| diff --git a/base/synchronization/condition_variable_unittest.cc b/base/synchronization/condition_variable_unittest.cc
|
| index e63a723d0097813cdee76c86be6b4e797dffd6f4..7fff6c17f4ba748a85e6182b1789eac008296cb2 100644
|
| --- a/base/synchronization/condition_variable_unittest.cc
|
| +++ b/base/synchronization/condition_variable_unittest.cc
|
| @@ -243,13 +243,7 @@ TEST_F(ConditionVariableTest, DISABLED_TimeoutAcrossSetTimeOfDay) {
|
| #endif
|
|
|
|
|
| -// Suddenly got flaky on Win, see http://crbug.com/10607 (starting at
|
| -// comment #15).
|
| -#if defined(OS_WIN)
|
| -#define MAYBE_MultiThreadConsumerTest DISABLED_MultiThreadConsumerTest
|
| -#else
|
| #define MAYBE_MultiThreadConsumerTest MultiThreadConsumerTest
|
| -#endif
|
| // Test serial task servicing, as well as two parallel task servicing methods.
|
| TEST_F(ConditionVariableTest, MAYBE_MultiThreadConsumerTest) {
|
| const int kThreadCount = 10;
|
|
|