sync: Merge GU retry logic into normal GU

sync/sessions/test_util.h

 // 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.
 //
 // Utils to simulate various outcomes of a sync session.
 #ifndef SYNC_SESSIONS_TEST_UTIL_H_
 #define SYNC_SESSIONS_TEST_UTIL_H_
 
 #include "sync/engine/syncer.h"
 #include "sync/sessions/sync_session.h"
@@ skipping 29 matching lines @@
 void SimulateDownloadUpdatesFailed(ModelTypeSet requested_types,
                                    const sessions::NudgeTracker& nudge_tracker,
                                    sessions::SyncSession* session);
 void SimulateCommitFailed(ModelTypeSet requested_types,
                           const sessions::NudgeTracker& nudge_tracker,
                           sessions::SyncSession* session);
 void SimulateConnectionFailure(ModelTypeSet requested_types,
                                const sessions::NudgeTracker& nudge_tracker,
                                sessions::SyncSession* session);
 
-// Poll/Retry successes and failures.
-void SimulatePollRetrySuccess(ModelTypeSet requested_types,
-                              sessions::SyncSession* session);
-void SimulatePollRetryFailed(ModelTypeSet requested_types,
-                             sessions::SyncSession* session);
+// Poll successes and failures.
+void SimulatePollSuccess(ModelTypeSet requested_types,
+                         sessions::SyncSession* session);
+void SimulatePollFailed(ModelTypeSet requested_types,
+                        sessions::SyncSession* session);
 
 void SimulateGuRetryDelayCommandImpl(sessions::SyncSession* session,
                                      base::TimeDelta delay);
 
 void SimulateThrottledImpl(sessions::SyncSession* session,
     const base::TimeDelta& delta);
 
 void SimulateTypesThrottledImpl(
     sessions::SyncSession* session,
     ModelTypeSet types,
@@ skipping 30 matching lines @@
 
 ACTION_P(SimulateGuRetryDelayCommand, delay) {
   SimulateGuRetryDelayCommandImpl(arg0, delay);
 }
 
 }  // namespace test_util
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_TEST_UTIL_H_