| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
| (...skipping 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1369 // Run to wait for second retrying. | 1369 // Run to wait for second retrying. |
| 1370 RunLoop(); | 1370 RunLoop(); |
| 1371 | 1371 |
| 1372 StopSyncScheduler(); | 1372 StopSyncScheduler(); |
| 1373 } | 1373 } |
| 1374 | 1374 |
| 1375 ACTION_P2(VerifyRetryTimerDelay, scheduler_test, expected_delay) { | 1375 ACTION_P2(VerifyRetryTimerDelay, scheduler_test, expected_delay) { |
| 1376 EXPECT_EQ(expected_delay, scheduler_test->GetRetryTimerDelay()); | 1376 EXPECT_EQ(expected_delay, scheduler_test->GetRetryTimerDelay()); |
| 1377 } | 1377 } |
| 1378 | 1378 |
| 1379 TEST_F(SyncSchedulerTest, ReceiveNewRetryDelay) { | 1379 #if defined(OS_WIN) |
| 1380 // Times out: http://crbug.com/402212 |
| 1381 #define MAYBE_ReceiveNewRetryDelay DISABLED_ReceiveNewRetryDelay |
| 1382 #else |
| 1383 #define MAYBE_ReceiveNewRetryDelay ReceiveNewRetryDelay |
| 1384 #endif |
| 1385 TEST_F(SyncSchedulerTest, MAYBE_ReceiveNewRetryDelay) { |
| 1380 StartSyncScheduler(SyncScheduler::NORMAL_MODE); | 1386 StartSyncScheduler(SyncScheduler::NORMAL_MODE); |
| 1381 | 1387 |
| 1382 SyncShareTimes times; | 1388 SyncShareTimes times; |
| 1383 base::TimeDelta delay1 = base::TimeDelta::FromMilliseconds(100); | 1389 base::TimeDelta delay1 = base::TimeDelta::FromMilliseconds(100); |
| 1384 base::TimeDelta delay2 = base::TimeDelta::FromMilliseconds(200); | 1390 base::TimeDelta delay2 = base::TimeDelta::FromMilliseconds(200); |
| 1385 | 1391 |
| 1386 scheduler()->ScheduleLocalRefreshRequest(zero(), ModelTypeSet(BOOKMARKS), | 1392 scheduler()->ScheduleLocalRefreshRequest(zero(), ModelTypeSet(BOOKMARKS), |
| 1387 FROM_HERE); | 1393 FROM_HERE); |
| 1388 scheduler()->OnReceivedGuRetryDelay(delay1); | 1394 scheduler()->OnReceivedGuRetryDelay(delay1); |
| 1389 EXPECT_EQ(delay1, GetRetryTimerDelay()); | 1395 EXPECT_EQ(delay1, GetRetryTimerDelay()); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 1402 .WillOnce(DoAll(Invoke(sessions::test_util::SimulateNormalSuccess), | 1408 .WillOnce(DoAll(Invoke(sessions::test_util::SimulateNormalSuccess), |
| 1403 RecordSyncShare(×))); | 1409 RecordSyncShare(×))); |
| 1404 | 1410 |
| 1405 // Run to wait for retrying. | 1411 // Run to wait for retrying. |
| 1406 RunLoop(); | 1412 RunLoop(); |
| 1407 | 1413 |
| 1408 StopSyncScheduler(); | 1414 StopSyncScheduler(); |
| 1409 } | 1415 } |
| 1410 | 1416 |
| 1411 } // namespace syncer | 1417 } // namespace syncer |
| OLD | NEW |