sync: use progress markers instead of timestamps during GetUpdates

chrome/browser/sync/engine/syncapi.cc

 // Copyright (c) 2010 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 "chrome/browser/sync/engine/syncapi.h"
 
 #include <bitset>
 #include <iomanip>
 #include <list>
 #include <string>
@@ skipping 1045 matching lines @@
   TalkMediator* talk_mediator() { return talk_mediator_.get(); }
   void set_observer(SyncManager::Observer* observer) { observer_ = observer; }
   UserShare* GetUserShare() { return &share_; }
 
   // Return the currently active (validated) username for use with syncable
   // types.
   const std::string& username_for_share() const {
     return share_.name;
   }
 
-  // Note about SyncManager::Status implementation: Status is a trimmed
-  // down AllStatus::Status, augmented with authentication failure information
-  // gathered from the internal AuthWatcher. The sync UI itself hooks up to
-  // various sources like the AuthWatcher individually, but with syncapi we try
-  // to keep everything status-related in one place. This means we have to
-  // privately manage state about authentication failures, and whenever the
-  // status or status summary is requested we aggregate this state with
-  // AllStatus::Status information.
-  Status ComputeAggregatedStatus();
-  Status::Summary ComputeAggregatedStatusSummary();
+  Status GetStatus();
 
   // See SyncManager::Shutdown for information.
   void Shutdown();
 
   // Whether we're initialized to the point of being able to accept changes
   // (and hence allow transaction creation). See initialized_ for details.
   bool initialized() const {
     AutoLock lock(initialized_mutex_);
     return initialized_;
   }
@@ skipping 971 matching lines @@
       change_buffers_[type].PushDeletedItem(id);
     else if (exists_now && existed_before && VisiblePropertiesDiffer(*i, e))
       change_buffers_[type].PushUpdatedItem(id, VisiblePositionsDiffer(*i, e));
 
     SetExtraChangeRecordData(id, type, &change_buffers_[type],
                              dir_manager()->cryptographer(), *i,
                              existed_before, exists_now);
   }
 }
 
-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;
-  }
-}
-
-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;
+SyncManager::Status SyncManager::SyncInternal::GetStatus() {
+  return allstatus_.status();
 }
 
 void SyncManager::SyncInternal::OnSyncEngineEvent(
     const SyncEngineEvent& event) {
   if (!observer_)
     return;
 
   // Only send an event if this is due to a cycle ending and this cycle
   // concludes a canonical "sync" process; that is, based on what is known
   // locally we are "all happy" and up-to-date.  There may be new changes on
@@ skipping 185 matching lines @@
   if (VLOG_IS_ON(1)) {
     std::string encoded_state;
     base::Base64Encode(state, &encoded_state);
     VLOG(1) << "Writing notification state: " << encoded_state;
   }
   lookup->SetNotificationState(state);
   lookup->SaveChanges();
 }
 
 SyncManager::Status::Summary SyncManager::GetStatusSummary() const {
-  return data_->ComputeAggregatedStatusSummary();
+  return data_->GetStatus().summary;
 }
 
 SyncManager::Status SyncManager::GetDetailedStatus() const {
-  return data_->ComputeAggregatedStatus();
+  return data_->GetStatus();
 }
 
 SyncManager::SyncInternal* SyncManager::GetImpl() const { return data_; }
 
 void SyncManager::SaveChanges() {
   data_->SaveChanges();
 }
 
 void SyncManager::SyncInternal::SaveChanges() {
   syncable::ScopedDirLookup lookup(dir_manager(), username_for_share());
@@ skipping 23 matching lines @@
   DCHECK(data_->initialized()) << "GetUserShare requires initialization!";
   return data_->GetUserShare();
 }
 
 bool SyncManager::HasUnsyncedItems() const {
   sync_api::ReadTransaction trans(GetUserShare());
   return (trans.GetWrappedTrans()->directory()->unsynced_entity_count() != 0);
 }
 
 }  // namespace sync_api