sync: GU retry with less explicit TimeTicks logic

sync/engine/sync_scheduler_unittest.cc

Index: sync/engine/sync_scheduler_unittest.cc
diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc
index 7b0a0d35c03720d0f8723e9b9b18354c21f54b1f..aeac1d71ee9e9a978d26be1bfde1213e969afdc8 100644
--- a/sync/engine/sync_scheduler_unittest.cc
+++ b/sync/engine/sync_scheduler_unittest.cc
@@ -1312,6 +1312,7 @@ TEST_F(SyncSchedulerTest, SuccessfulRetry) {
   SyncShareTimes times;
   base::TimeDelta delay = base::TimeDelta::FromMilliseconds(1);
   scheduler()->OnReceivedGuRetryDelay(delay);
+  scheduler()->ProcessReceivedGuRetryDelay();
   EXPECT_EQ(delay, GetRetryTimerDelay());
 
   EXPECT_CALL(*syncer(), RetrySyncShare(_,_))
@@ -1334,6 +1335,7 @@ TEST_F(SyncSchedulerTest, FailedRetry) {
 
   base::TimeDelta delay = base::TimeDelta::FromMilliseconds(1);
   scheduler()->OnReceivedGuRetryDelay(delay);
+  scheduler()->ProcessReceivedGuRetryDelay();
 
   EXPECT_CALL(*syncer(), RetrySyncShare(_,_))
       .WillOnce(
@@ -1369,21 +1371,23 @@ TEST_F(SyncSchedulerTest, ReceiveNewRetryDelay) {
   scheduler()->ScheduleLocalRefreshRequest(zero(), ModelTypeSet(BOOKMARKS),
                                            FROM_HERE);
   scheduler()->OnReceivedGuRetryDelay(delay1);
+  scheduler()->ProcessReceivedGuRetryDelay();
+  EXPECT_EQ(delay1, GetRetryTimerDelay());
 
+  scheduler()->ClearReceivedGuRetryDelayFlag();
   EXPECT_CALL(*syncer(), NormalSyncShare(_,_,_))
       .WillOnce(DoAll(
           WithoutArgs(VerifyRetryTimerDelay(this, delay1)),
           WithArg<2>(sessions::test_util::SimulateGuRetryDelayCommand(delay2)),
-          WithoutArgs(VerifyRetryTimerDelay(this, delay2)),
           RecordSyncShare(&times)));
 
   // Run nudge GU.
   RunLoop();
+  EXPECT_EQ(delay2, GetRetryTimerDelay());
 
   EXPECT_CALL(*syncer(), RetrySyncShare(_,_))
-      .WillOnce(
-          DoAll(Invoke(sessions::test_util::SimulatePollRetrySuccess),
-                RecordSyncShare(&times)));
+      .WillOnce(DoAll(Invoke(sessions::test_util::SimulatePollRetrySuccess),
+                      RecordSyncShare(&times)));
 
   // Run to wait for retrying.
   RunLoop();