sync: Merge GU retry logic into normal GU

sync/sessions/data_type_tracker.cc

Index: sync/sessions/data_type_tracker.cc
diff --git a/sync/sessions/data_type_tracker.cc b/sync/sessions/data_type_tracker.cc
index 9e5c870c505a572ed6ad5626dd9c53187d19d1bf..5e0ee90171e6c2b21ae4356380c4d63faa5d7ac6 100644
--- a/sync/sessions/data_type_tracker.cc
+++ b/sync/sessions/data_type_tracker.cc
@@ -130,26 +130,25 @@ void DataTypeTracker::UpdatePayloadBufferSize(size_t new_size) {
 }
 
 bool DataTypeTracker::IsSyncRequired() const {
-  return !IsThrottled() &&
-      (local_nudge_count_ > 0 ||
-       local_refresh_request_count_ > 0 ||
-       HasPendingInvalidation() ||
-       drop_tracker_.IsRecoveringFromDropEvent());
+  return !IsThrottled() && (HasLocalChangePending() || IsGetUpdatesRequired());
 }
 
 bool DataTypeTracker::IsGetUpdatesRequired() const {
   return !IsThrottled() &&
-      (local_refresh_request_count_ > 0 ||
-       HasPendingInvalidation() ||
-       drop_tracker_.IsRecoveringFromDropEvent());
+      (HasRefreshRequestPending() || HasPendingInvalidation());
 }
 
 bool DataTypeTracker::HasLocalChangePending() const {
   return local_nudge_count_ > 0;
 }
 
+bool DataTypeTracker::HasRefreshRequestPending() const {
+  return local_refresh_request_count_ > 0;
+}
+
 bool DataTypeTracker::HasPendingInvalidation() const {
-  return !pending_invalidations_.IsEmpty();
+  return !pending_invalidations_.IsEmpty()
+      || drop_tracker_.IsRecoveringFromDropEvent();
 }
 
 void DataTypeTracker::SetLegacyNotificationHint(