sync: Merge GU retry logic into normal GU

sync/sessions/test_util.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 "sync/sessions/test_util.h"
 
 namespace syncer {
 namespace sessions {
 namespace test_util {
 
@@ skipping 63 matching lines @@
 }
 
 void SimulateConnectionFailure(
                            ModelTypeSet requested_types,
                            const sessions::NudgeTracker& nudge_tracker,
                            sessions::SyncSession* session) {
   session->mutable_status_controller()->set_last_download_updates_result(
       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(
       SERVER_RETURN_TRANSIENT_ERROR);
 }
 
 void SimulateThrottledImpl(
     sessions::SyncSession* session,
     const base::TimeDelta& delta) {
   session->mutable_status_controller()->set_last_download_updates_result(
       SERVER_RETURN_THROTTLED);
   session->delegate()->OnThrottled(delta);
 }
 
 void SimulateTypesThrottledImpl(
     sessions::SyncSession* session,
     ModelTypeSet types,
     const base::TimeDelta& delta) {
   session->mutable_status_controller()->set_last_download_updates_result(
       SERVER_RETURN_THROTTLED);
   session->delegate()->OnTypesThrottled(types, delta);
 }
 
 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);
 }
 
 void SimulateSessionsCommitDelayUpdateImpl(
     ModelTypeSet requested_types,
     const sessions::NudgeTracker& nudge_tracker,
     sessions::SyncSession* session,
     const base::TimeDelta& new_delay) {
   SimulateNormalSuccess(requested_types, nudge_tracker, session);
   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