[Recommit]

sync/sessions/test_util.cc

Index: sync/sessions/test_util.cc
diff --git a/sync/sessions/test_util.cc b/sync/sessions/test_util.cc
index 538ed0f88c042490e7f4e8353189781f125cce07..951db8d1dbe3200d7e7d1754aba7af847e84f15b 100644
--- a/sync/sessions/test_util.cc
+++ b/sync/sessions/test_util.cc
@@ -81,15 +81,15 @@ void SimulateConnectionFailure(
       NETWORK_CONNECTION_UNAVAILABLE);
 }
 
-void SimulatePollSuccess(ModelTypeSet requested_types,
-                         sessions::SyncSession* session) {
+void SimulatePollRetrySuccess(ModelTypeSet requested_types,
+                              sessions::SyncSession* session) {
   ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
   session->mutable_status_controller()->set_last_download_updates_result(
       SYNCER_OK);
 }
 
-void SimulatePollFailed(ModelTypeSet requested_types,
-                        sessions::SyncSession* session) {
+void SimulatePollRetryFailed(ModelTypeSet requested_types,
+                             sessions::SyncSession* session) {
   ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
   session->mutable_status_controller()->set_last_download_updates_result(
       SERVER_RETURN_TRANSIENT_ERROR);
@@ -116,7 +116,7 @@ void SimulatePollIntervalUpdateImpl(
     ModelTypeSet requested_types,
     sessions::SyncSession* session,
     const base::TimeDelta& new_poll) {
-  SimulatePollSuccess(requested_types, session);
+  SimulatePollRetrySuccess(requested_types, session);
   session->delegate()->OnReceivedLongPollIntervalUpdate(new_poll);
 }
 
@@ -129,6 +129,13 @@ void SimulateSessionsCommitDelayUpdateImpl(
   session->delegate()->OnReceivedSessionsCommitDelay(new_delay);
 }
 
+void SimulateGuRetryDelayCommandImpl(sessions::SyncSession* session,
+                                     base::TimeDelta delay) {
+  session->mutable_status_controller()->set_last_download_updates_result(
+      SYNCER_OK);
+  session->delegate()->OnReceivedGuRetryDelay(delay);
+}
+
 }  // namespace test_util
 }  // namespace sessions
 }  // namespace syncer