Relieve SyncerSession,SyncCycleState, SyncProcessState, SyncerSession, Syncer...

chrome/browser/sync/sessions/session_state.cc

Index: chrome/browser/sync/sessions/session_state.cc
===================================================================
--- chrome/browser/sync/sessions/session_state.cc	(revision 0)
+++ chrome/browser/sync/sessions/session_state.cc	(revision 0)
@@ -0,0 +1,186 @@
+// Copyright (c) 2009 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/sessions/session_state.h"
+
+#include <set>
+#include <vector>
+
+using std::set;
+using std::vector;
+
+namespace browser_sync {
+namespace sessions {
+
+IdToConflictSetMap::const_iterator ConflictProgress::IdToConflictSetFind(
+    const syncable::Id& the_id) const {
+  return id_to_conflict_set_.find(the_id);
+}
+
+IdToConflictSetMap::const_iterator
+ConflictProgress::IdToConflictSetBegin() const {
+  return id_to_conflict_set_.begin();
+}
+
+IdToConflictSetMap::const_iterator
+ConflictProgress::IdToConflictSetEnd() const {
+  return id_to_conflict_set_.end();
+}
+
+IdToConflictSetMap::size_type ConflictProgress::IdToConflictSetSize() const {
+  return id_to_conflict_set_.size();
+}
+
+const ConflictSet* ConflictProgress::IdToConflictSetGet(
+    const syncable::Id& the_id) {
+  return id_to_conflict_set_[the_id];
+}
+
+std::set<ConflictSet*>::const_iterator
+ConflictProgress::ConflictSetsBegin() const {
+  return conflict_sets_.begin();
+}
+
+std::set<ConflictSet*>::const_iterator
+ConflictProgress::ConflictSetsEnd() const {
+  return conflict_sets_.end();
+}
+
+std::set<ConflictSet*>::size_type
+ConflictProgress::ConflictSetsSize() const {
+  return conflict_sets_.size();
+}
+
+std::set<syncable::Id>::iterator
+ConflictProgress::ConflictingItemsBegin() {
+  return conflicting_item_ids_.begin();
+}
+std::set<syncable::Id>::const_iterator
+ConflictProgress::ConflictingItemsBeginConst() const {
+  return conflicting_item_ids_.begin();
+}
+std::set<syncable::Id>::const_iterator
+ConflictProgress::ConflictingItemsEnd() const {
+  return conflicting_item_ids_.end();
+}
+
+void ConflictProgress::AddConflictingItemById(const syncable::Id& the_id) {
+  std::pair<std::set<syncable::Id>::iterator, bool> ret =
+    conflicting_item_ids_.insert(the_id);
+  progress_changed_ |= ret.second;
+}
+
+void ConflictProgress::EraseConflictingItemById(const syncable::Id& the_id) {
+  int items_erased = conflicting_item_ids_.erase(the_id);
+  progress_changed_ = items_erased != 0;
+}
+
+void ConflictProgress::MergeSets(const syncable::Id& id1,
+                                 const syncable::Id& id2) {
+  // There are no single item sets, we just leave those entries == 0
+  vector<syncable::Id>* set1 = id_to_conflict_set_[id1];
+  vector<syncable::Id>* set2 = id_to_conflict_set_[id2];
+  vector<syncable::Id>* rv = 0;
+  if (0 == set1 && 0 == set2) {
+    // Neither item currently has a set so we build one.
+    rv = new vector<syncable::Id>();
+    rv->push_back(id1);
+    if (id1 != id2) {
+      rv->push_back(id2);
+    } else {
+      LOG(WARNING) << "[BUG] Attempting to merge two identical conflict ids.";
+    }
+    conflict_sets_.insert(rv);
+  } else if (0 == set1) {
+    // Add the item to the existing set.
+    rv = set2;
+    rv->push_back(id1);
+  } else if (0 == set2) {
+    // Add the item to the existing set.
+    rv = set1;
+    rv->push_back(id2);
+  } else if (set1 == set2) {
+    // It's the same set already.
+    return;
+  } else {
+    // Merge the two sets.
+    rv = set1;
+    // Point all the second sets id's back to the first.
+    vector<syncable::Id>::iterator i;
+    for (i = set2->begin() ; i != set2->end() ; ++i) {
+      id_to_conflict_set_[*i] = rv;
+    }
+    // Copy the second set to the first.
+    rv->insert(rv->end(), set2->begin(), set2->end());
+    conflict_sets_.erase(set2);
+    delete set2;
+  }
+  id_to_conflict_set_[id1] = id_to_conflict_set_[id2] = rv;
+}
+
+void ConflictProgress::CleanupSets() {
+  // Clean up all the sets.
+  set<ConflictSet*>::iterator i;
+  for (i = conflict_sets_.begin(); i != conflict_sets_.end(); i++) {
+    delete *i;
+  }
+  conflict_sets_.clear();
+  id_to_conflict_set_.clear();
+}
+
+void UpdateProgress::AddVerifyResult(const VerifyResult& verify_result,
+                                     const sync_pb::SyncEntity& entity) {
+  verified_updates_.push_back(std::make_pair(verify_result, entity));
+}
+
+void UpdateProgress::AddAppliedUpdate(const UpdateAttemptResponse& response,
+    const syncable::Id& id) {
+  applied_updates_.push_back(std::make_pair(response, id));
+}
+
+std::vector<AppliedUpdate>::iterator UpdateProgress::AppliedUpdatesBegin() {
+  return applied_updates_.begin();
+}
+
+std::vector<VerifiedUpdate>::const_iterator
+UpdateProgress::VerifiedUpdatesBegin() const {
+  return verified_updates_.begin();
+}
+
+std::vector<AppliedUpdate>::const_iterator
+UpdateProgress::AppliedUpdatesEnd() const {
+  return applied_updates_.end();
+}
+
+std::vector<VerifiedUpdate>::const_iterator
+UpdateProgress::VerifiedUpdatesEnd() const {
+  return verified_updates_.end();
+}
+
+int UpdateProgress::SuccessfullyAppliedUpdateCount() const {
+  int count = 0;
+  for (std::vector<AppliedUpdate>::const_iterator it =
+       applied_updates_.begin();
+       it != applied_updates_.end();
+       ++it) {
+    if (it->first == SUCCESS)
+      count++;
+  }
+  return count;
+}
+
+// Returns true if at least one update application failed due to a conflict
+// during this sync cycle.
+bool UpdateProgress::HasConflictingUpdates() const {
+  std::vector<AppliedUpdate>::const_iterator it;
+  for (it = applied_updates_.begin(); it != applied_updates_.end(); ++it) {
+    if (it->first == CONFLICT) {
+      return true;
+    }
+  }
+  return false;
+}
+
+}  // namespace sessions
+}  // namespace browser_sync
Property changes on: chrome\browser\sync\sessions\session_state.cc
___________________________________________________________________
Added: svn:eol-style
   + LF