Revert 244381 "Support GU retry command in sync engine. The comm..."

trunk/src/sync/sessions/test_util.cc

Index: trunk/src/sync/sessions/test_util.cc
===================================================================
--- trunk/src/sync/sessions/test_util.cc	(revision 244437)
+++ trunk/src/sync/sessions/test_util.cc	(working copy)
@@ -81,15 +81,15 @@
       NETWORK_CONNECTION_UNAVAILABLE);
 }
 
-void SimulatePollRetrySuccess(ModelTypeSet requested_types,
-                              sessions::SyncSession* session) {
+void SimulatePollSuccess(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 SimulatePollRetryFailed(ModelTypeSet requested_types,
-                             sessions::SyncSession* session) {
+void SimulatePollFailed(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 @@
     ModelTypeSet requested_types,
     sessions::SyncSession* session,
     const base::TimeDelta& new_poll) {
-  SimulatePollRetrySuccess(requested_types, session);
+  SimulatePollSuccess(requested_types, session);
   session->delegate()->OnReceivedLongPollIntervalUpdate(new_poll);
 }
 
@@ -129,13 +129,6 @@
   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