sync: GU retry with less explicit TimeTicks logic

sync/engine/sync_scheduler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 1294 matching lines @@
   RunLoop();
   StopSyncScheduler();
 }
 
 TEST_F(SyncSchedulerTest, SuccessfulRetry) {
   StartSyncScheduler(SyncScheduler::NORMAL_MODE);
 
   SyncShareTimes times;
   base::TimeDelta delay = base::TimeDelta::FromMilliseconds(1);
   scheduler()->OnReceivedGuRetryDelay(delay);
+  scheduler()->ProcessReceivedGuRetryDelay();
   EXPECT_EQ(delay, GetRetryTimerDelay());
 
   EXPECT_CALL(*syncer(), RetrySyncShare(_,_))
       .WillOnce(
           DoAll(Invoke(sessions::test_util::SimulatePollRetrySuccess),
                 RecordSyncShare(&times)));
 
   // Run to wait for retrying.
   RunLoop();
 
   StopSyncScheduler();
 }
 
 TEST_F(SyncSchedulerTest, FailedRetry) {
   UseMockDelayProvider();
   EXPECT_CALL(*delay(), GetDelay(_))
       .WillRepeatedly(Return(TimeDelta::FromMilliseconds(1)));
 
   StartSyncScheduler(SyncScheduler::NORMAL_MODE);
 
   base::TimeDelta delay = base::TimeDelta::FromMilliseconds(1);
   scheduler()->OnReceivedGuRetryDelay(delay);
+  scheduler()->ProcessReceivedGuRetryDelay();
 
   EXPECT_CALL(*syncer(), RetrySyncShare(_,_))
       .WillOnce(
           DoAll(Invoke(sessions::test_util::SimulatePollRetryFailed),
                 QuitLoopNowAction()));
 
   // Run to wait for retrying.
   RunLoop();
 
   EXPECT_TRUE(scheduler()->IsBackingOff());
@@ skipping 15 matching lines @@
 TEST_F(SyncSchedulerTest, ReceiveNewRetryDelay) {
   StartSyncScheduler(SyncScheduler::NORMAL_MODE);
 
   SyncShareTimes times;
   base::TimeDelta delay1 = base::TimeDelta::FromMilliseconds(100);
   base::TimeDelta delay2 = base::TimeDelta::FromMilliseconds(200);
 
   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();
 
   StopSyncScheduler();
 }
 
 }  // namespace syncer