sync: Merge GU retry logic into normal GU

sync/engine/get_updates_processor_unittest.cc

Index: sync/engine/get_updates_processor_unittest.cc
diff --git a/sync/engine/get_updates_processor_unittest.cc b/sync/engine/get_updates_processor_unittest.cc
index f8fd2740cb299ebc847437d5f696fb2bfd4cb6f0..c494289c09b3943dc3f0117668f3ac277028355c 100644
--- a/sync/engine/get_updates_processor_unittest.cc
+++ b/sync/engine/get_updates_processor_unittest.cc
@@ -215,9 +215,9 @@ TEST_F(GetUpdatesProcessorTest, RetryTest) {
   nudge_tracker.SetSyncCycleStartTime(t1 + base::TimeDelta::FromSeconds(1));
 
   sync_pb::ClientToServerMessage message;
-  RetryGetUpdatesDelegate retry_delegate;
+  NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
   scoped_ptr<GetUpdatesProcessor> processor(
-      BuildGetUpdatesProcessor(retry_delegate));
+      BuildGetUpdatesProcessor(normal_delegate));
   processor->PrepareGetUpdates(request_types(), &message);
 
   const sync_pb::GetUpdatesMessage& gu_msg = message.get_updates();