sync: Remove UpdateProgress and related code

sync/sessions/status_controller.cc

 // 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.
 
 #include "sync/sessions/status_controller.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync_protocol_error.h"
 
 namespace syncer {
 namespace sessions {
 
 StatusController::StatusController(const ModelSafeRoutingInfo& routes)
     : per_model_group_deleter_(&per_model_group_),
       group_restriction_in_effect_(false),
       group_restriction_(GROUP_PASSIVE),
       routing_info_(routes) {
 }
 
 StatusController::~StatusController() {}
 
-const UpdateProgress* StatusController::update_progress() const {
-  const PerModelSafeGroupState* state =
-      GetModelSafeGroupState(true, group_restriction_);
-  return state ? &state->update_progress : NULL;
-}
-
-UpdateProgress* StatusController::mutable_update_progress() {
-  return &GetOrCreateModelSafeGroupState(
-      true, group_restriction_)->update_progress;
-}
-
 const std::set<syncable::Id>* StatusController::simple_conflict_ids() const {
   const PerModelSafeGroupState* state =
       GetModelSafeGroupState(true, group_restriction_);
   return state ? &state->simple_conflict_ids : NULL;
 }
 
 std::set<syncable::Id>* StatusController::mutable_simple_conflict_ids() {
   return &GetOrCreateModelSafeGroupState(
       true, group_restriction_)->simple_conflict_ids;
 }
 
 const std::set<syncable::Id>*
     StatusController::GetUnrestrictedSimpleConflictIds(
         ModelSafeGroup group) const {
   const PerModelSafeGroupState* state = GetModelSafeGroupState(false, group);
   return state ? &state->simple_conflict_ids : NULL;
 }
 
-const UpdateProgress* StatusController::GetUnrestrictedUpdateProgress(
-    ModelSafeGroup group) const {
-  const PerModelSafeGroupState* state = GetModelSafeGroupState(false, group);
-  return state ? &state->update_progress : NULL;
-}
-
-UpdateProgress*
-    StatusController::GetUnrestrictedMutableUpdateProgressForTest(
-        ModelSafeGroup group) {
-  return &GetOrCreateModelSafeGroupState(false, group)->update_progress;
-}
-
 const PerModelSafeGroupState* StatusController::GetModelSafeGroupState(
     bool restrict, ModelSafeGroup group) const {
   DCHECK_EQ(restrict, group_restriction_in_effect_);
   std::map<ModelSafeGroup, PerModelSafeGroupState*>::const_iterator it =
       per_model_group_.find(group);
   return (it == per_model_group_.end()) ? NULL : it->second;
 }
 
 PerModelSafeGroupState* StatusController::GetOrCreateModelSafeGroupState(
     bool restrict, ModelSafeGroup group) {
@@ skipping 104 matching lines @@
   const sync_pb::ClientToServerResponse& updates =
       model_neutral_.updates_response;
   if (updates.has_get_updates()) {
     return updates.get_updates().entries().size();
   } else {
     return 0;
   }
 }
 
 bool StatusController::HasConflictingUpdates() const {
-  DCHECK(!group_restriction_in_effect_)
-      << "HasConflictingUpdates applies to all ModelSafeGroups";
-  std::map<ModelSafeGroup, PerModelSafeGroupState*>::const_iterator it =
-    per_model_group_.begin();
-  for (; it != per_model_group_.end(); ++it) {
-    if (it->second->update_progress.HasConflictingUpdates())
-      return true;
-  }
-  return false;
+  return TotalNumConflictingItems() > 0;
+}
+
+int StatusController::num_updates_applied() const {
+  return model_neutral_.num_updates_applied;
 }
 
 int StatusController::num_encryption_conflicts() const {
   return model_neutral_.num_encryption_conflicts;
 }
 
 int StatusController::num_hierarchy_conflicts() const {
   DCHECK(!group_restriction_in_effect_)
       << "num_hierarchy_conflicts applies to all ModelSafeGroups";
   return model_neutral_.num_hierarchy_conflicts;
@@ skipping 44 matching lines @@
 void StatusController::set_debug_info_sent() {
   model_neutral_.debug_info_sent = true;
 }
 
 bool StatusController::debug_info_sent() const {
   return model_neutral_.debug_info_sent;
 }
 
 }  // namespace sessions
 }  // namespace syncer