sync: use progress markers instead of timestamps during GetUpdates

chrome/browser/sync/engine/syncapi.cc

Index: chrome/browser/sync/engine/syncapi.cc
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc
index 206125b4ecc072b1afd410135e6df2cb6a9e3712..397216d362859531d5c19d56c5eeef72125f3deb 100644
--- a/chrome/browser/sync/engine/syncapi.cc
+++ b/chrome/browser/sync/engine/syncapi.cc
@@ -2066,45 +2066,11 @@ void SyncManager::SyncInternal::HandleCalculateChangesChangeEventFromSyncer(
 
 SyncManager::Status::Summary
 SyncManager::SyncInternal::ComputeAggregatedStatusSummary() {
-  switch (allstatus_.status().icon) {
-    case AllStatus::OFFLINE:
-      return Status::OFFLINE;
-    case AllStatus::OFFLINE_UNSYNCED:
-      return Status::OFFLINE_UNSYNCED;
-    case AllStatus::SYNCING:
-      return Status::SYNCING;
-    case AllStatus::READY:
-      return Status::READY;
-    case AllStatus::CONFLICT:
-      return Status::CONFLICT;
-    case AllStatus::OFFLINE_UNUSABLE:
-      return Status::OFFLINE_UNUSABLE;
-    default:
-      return Status::INVALID;
-  }
+  return allstatus_.status().summary;
 }
 
 SyncManager::Status SyncManager::SyncInternal::ComputeAggregatedStatus() {
-  Status return_status =
-      { ComputeAggregatedStatusSummary(),
-        allstatus_.status().authenticated,
-        allstatus_.status().server_up,
-        allstatus_.status().server_reachable,
-        allstatus_.status().server_broken,
-        allstatus_.status().notifications_enabled,
-        allstatus_.status().notifications_received,
-        allstatus_.status().notifications_sent,
-        allstatus_.status().unsynced_count,
-        allstatus_.status().conflicting_count,
-        allstatus_.status().syncing,
-        allstatus_.status().initial_sync_ended,
-        allstatus_.status().syncer_stuck,
-        allstatus_.status().updates_available,
-        allstatus_.status().updates_received,
-        allstatus_.status().disk_full,
-        false,   // TODO(ncarter): invalid store?
-        allstatus_.status().max_consecutive_errors};
-  return return_status;
+  return allstatus_.status();
 }
 
 void SyncManager::SyncInternal::OnSyncEngineEvent(