sync: Merge GU retry logic into normal GU

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 951db8d1dbe3200d7e7d1754aba7af847e84f15b..95db11bb39492a0e08bcb22de24aab35e2aa6816 100644
--- a/sync/sessions/test_util.cc
+++ b/sync/sessions/test_util.cc
@@ -81,14 +81,14 @@ void SimulateConnectionFailure(
       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,
+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(
@@ -116,7 +116,7 @@ void SimulatePollIntervalUpdateImpl(
     ModelTypeSet requested_types,
     sessions::SyncSession* session,
     const base::TimeDelta& new_poll) {
-  SimulatePollRetrySuccess(requested_types, session);
+  SimulatePollSuccess(requested_types, session);
   session->delegate()->OnReceivedLongPollIntervalUpdate(new_poll);
 }