sync: Don't use ConflictProgress in the resolver

Remove all references to the ConflictProgress struct from the place
where it is needed most: the ConflictResolver. It turns out that the
ConflictResolver's only relevant input is a set of simple conflict IDs,
and it has no need for the rest of the ConflictProgress struct.

This change is a step towards the removal of the ConflictProgress
struct, which will eventually allow us to improve the way that the
syncer handles conflicts.

This commit also cleans up some includes and forward declarations in the
conflict resolver.

BUG=147681

Review URL: https://chromiumcodereview.appspot.com/10989087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159621 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 11 deletions

diff --git a/sync/sessions/session_state.cc b/sync/sessions/session_state.cc
index cd99800..015b20c 100644
--- a/sync/sessions/session_state.cc
+++ b/sync/sessions/session_state.cc
@@ -28,13 +28,8 @@ bool ConflictProgress::HasSimpleConflictItem(const syncable::Id& id) const {
   return simple_conflicting_item_ids_.count(id) > 0;
 }
 
-std::set<syncable::Id>::const_iterator
-ConflictProgress::SimpleConflictingItemsBegin() const {
-  return simple_conflicting_item_ids_.begin();
-}
-std::set<syncable::Id>::const_iterator
-ConflictProgress::SimpleConflictingItemsEnd() const {
-  return simple_conflicting_item_ids_.end();
+const std::set<syncable::Id>& ConflictProgress::SimpleConflictingItems() const {
+  return simple_conflicting_item_ids_;
 }
 
 void ConflictProgress::AddSimpleConflictingItemById(
diff --git a/sync/sessions/session_state.h b/sync/sessions/session_state.h
index 290ecee..eff9591 100644
--- a/sync/sessions/session_state.h
+++ b/sync/sessions/session_state.h
@@ -33,8 +33,7 @@ class ConflictProgress {
   // Various mutators for tracking commit conflicts.
   void AddSimpleConflictingItemById(const syncable::Id& the_id);
   void EraseSimpleConflictingItemById(const syncable::Id& the_id);
-  std::set<syncable::Id>::const_iterator SimpleConflictingItemsBegin() const;
-  std::set<syncable::Id>::const_iterator SimpleConflictingItemsEnd() const;
+  const std::set<syncable::Id>& SimpleConflictingItems() const;
   int SimpleConflictingItemsSize() const {
     return simple_conflicting_item_ids_.size();
   }
diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc
index b7bb5ca..b2be0e5 100644
--- a/sync/sessions/sync_session.cc
+++ b/sync/sessions/sync_session.cc
@@ -215,8 +215,7 @@ std::set<ModelSafeGroup> SyncSession::GetEnabledGroupsWithConflicts() const {
     const sessions::ConflictProgress* conflict_progress =
         status_controller_->GetUnrestrictedConflictProgress(*it);
     if (conflict_progress &&
-        (conflict_progress->SimpleConflictingItemsBegin() !=
-         conflict_progress->SimpleConflictingItemsEnd())) {
+        conflict_progress->SimpleConflictingItemsSize() > 0) {
       enabled_groups_with_conflicts.insert(*it);
     }
   }