sync: Remove the remaining conflict sets code

chrome/browser/sync/sessions/session_state.h

 // 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.
 
 // The 'sessions' namespace comprises all the pieces of state that are
 // combined to form a SyncSession instance. In that way, it can be thought of
 // as an extension of the SyncSession type itself. Session scoping gives
 // context to things like "conflict progress", "update progress", etc, and the
 // separation this file provides allows clients to only include the parts they
 // need rather than the entire session stack.
@@ skipping 111 matching lines @@
       const SyncerStatus& syncer_status,
       const ErrorCounters& errors,
       int64 num_server_changes_remaining,
       bool is_share_usable,
       syncable::ModelTypeSet initial_sync_ended,
       const std::string
           (&download_progress_markers)[syncable::MODEL_TYPE_COUNT],
       bool more_to_sync,
       bool is_silenced,
       int64 unsynced_count,
       int num_blocking_conflicting_updates,

[Nicolas Zea, 2012/02/02 21:53:41]

num_resolvable (here and below)

[rlarocque, 2012/02/03 22:31:15]

Done, sort of.  I'm using "simple" instead of resolvable here.  I'm hoping that
will be easier to understand in the contexts where we're going to use these
values (ie. far away from ConflictResolver).

Let me know if you disagree with this choice of name.

       int num_conflicting_updates,
       bool did_commit_items,
       const SyncSourceInfo& source,
       size_t num_entries,
       base::Time sync_start_time,
       bool retry_scheduled);
   ~SyncSessionSnapshot();
 
   // Caller takes ownership of the returned dictionary.
   base::DictionaryValue* ToValue() const;
@@ skipping 11 matching lines @@
   const int64 unsynced_count;
   const int num_blocking_conflicting_updates;
   const int num_conflicting_updates;
   const bool did_commit_items;
   const SyncSourceInfo source;
   const size_t num_entries;
   base::Time sync_start_time;
   const bool retry_scheduled;
 };
 
-// Tracks progress of conflicts and their resolution using conflict sets.
+// Tracks progress of conflicts and their resolutions.
 class ConflictProgress {
  public:
   explicit ConflictProgress(bool* dirty_flag);
   ~ConflictProgress();
-  // Various iterators, size, and retrieval functions for conflict sets.
-  IdToConflictSetMap::const_iterator IdToConflictSetBegin() const;
-  IdToConflictSetMap::const_iterator IdToConflictSetEnd() const;
-  IdToConflictSetMap::size_type IdToConflictSetSize() const;
-  IdToConflictSetMap::const_iterator IdToConflictSetFind(
-      const syncable::Id& the_id) const;
-  const ConflictSet* IdToConflictSetGet(const syncable::Id& the_id);
-  std::set<ConflictSet*>::const_iterator ConflictSetsBegin() const;
-  std::set<ConflictSet*>::const_iterator ConflictSetsEnd() const;
-  std::set<ConflictSet*>::size_type ConflictSetsSize() const;
-  bool HasSimpleConflictItem(const syncable::Id& id) const;
+
+  bool HasSimpleConflictItem(const syncable::Id &id) const;
 
   // Various mutators for tracking commit conflicts.
-  void AddConflictingItemById(const syncable::Id& the_id);
-  void EraseConflictingItemById(const syncable::Id& the_id);
-  int ConflictingItemsSize() const { return conflicting_item_ids_.size(); }
-  std::set<syncable::Id>::const_iterator ConflictingItemsBegin() const;
-  std::set<syncable::Id>::const_iterator ConflictingItemsEnd() const;
+  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;
+  int SimpleConflictingItemsSize() const {
+    return simple_conflicting_item_ids_.size();
+  }
 
   // Mutators for nonblocking conflicting items (see description below).
-  void AddNonblockingConflictingItemById(const syncable::Id& the_id);
-  void EraseNonblockingConflictingItemById(const syncable::Id& the_id);
-  int NonblockingConflictingItemsSize() const {
-    return nonblocking_conflicting_item_ids_.size();
+  void AddEncryptionConflictingItemById(const syncable::Id& the_id);
+  int EncryptionConflictingItemsSize() const {
+    return num_encryption_conflicting_items;
   }
 
-  void MergeSets(const syncable::Id& set1, const syncable::Id& set2);
-  void CleanupSets();
+  void AddHierarchyConflictingItemById(const syncable::Id& id);
+  int HierarchyConflictingItemsSize() const {
+    return num_hierarchy_conflicting_items;
+  }
+
+  void AddServerConflictingItemById(const syncable::Id& id);
+  int ServerConflictingItemsSize() const {
+    return num_server_conflicting_items;
+  }
 
  private:
-  // TODO(sync): move away from sets if it makes more sense.
-  std::set<syncable::Id> conflicting_item_ids_;
-  std::map<syncable::Id, ConflictSet*> id_to_conflict_set_;
-  std::set<ConflictSet*> conflict_sets_;
+  // Conflicts that occur when local and server changes collide and can be
+  // resolved locally.
+  std::set<syncable::Id> simple_conflicting_item_ids_;
 
-  // Nonblocking conflicts are not processed by the conflict resolver, but
-  // they will be processed in the APPLY_UDPATES_TO_RESOLVE_CONFLICTS step.
-  std::set<syncable::Id> nonblocking_conflicting_item_ids_;
+  // Unresolvable conflicts are not processed by the conflict resolver.  We wait
+  // and hope the server will provide us with an update that resolves these
+  // conflicts.
+  std::set<syncable::Id> unresolvable_conflicting_item_ids_;
+
+  size_t num_server_conflicting_items;
+  size_t num_hierarchy_conflicting_items;
+  size_t num_encryption_conflicting_items;
 
   // Whether a conflicting item was added or removed since
   // the last call to reset_progress_changed(), if any. In practice this
   // points to StatusController::is_dirty_.
   bool* dirty_;
 };
 
 typedef std::pair<VerifyResult, sync_pb::SyncEntity> VerifiedUpdate;
 typedef std::pair<UpdateAttemptResponse, syncable::Id> AppliedUpdate;
 
@@ skipping 110 matching lines @@
   ~PerModelSafeGroupState();
 
   UpdateProgress update_progress;
   ConflictProgress conflict_progress;
 };
 
 }  // namespace sessions
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_