diff options
Diffstat (limited to 'sync/engine/sync_scheduler_unittest.cc')
-rw-r--r-- | sync/engine/sync_scheduler_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index 4c33041..13c5441 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -1376,7 +1376,13 @@ ACTION_P2(VerifyRetryTimerDelay, scheduler_test, expected_delay) { EXPECT_EQ(expected_delay, scheduler_test->GetRetryTimerDelay()); } -TEST_F(SyncSchedulerTest, ReceiveNewRetryDelay) { +#if defined(OS_WIN) +// Times out: http://crbug.com/402212 +#define MAYBE_ReceiveNewRetryDelay DISABLED_ReceiveNewRetryDelay +#else +#define MAYBE_ReceiveNewRetryDelay ReceiveNewRetryDelay +#endif +TEST_F(SyncSchedulerTest, MAYBE_ReceiveNewRetryDelay) { StartSyncScheduler(SyncScheduler::NORMAL_MODE); SyncShareTimes times; |