Remove single direction conflict set code

This code was intended to operate on conflict sets that consist solely
of changes from the server.  However, we can never detect these kinds of
conflict sets because our conflict set detection code assumes that the
server never sends us an invalid set of changes; all conflict sets must
be cause, at least in part, by local changes.

This change also deletes various private and hidden functions that were
used only by the single direction conflict set code.  This reduced the
BuildAndProcessConflictSetsCommand::ExecuteImpl() into a single function
call, which I inlined.

Also removed in this change is the conflict_sets_built() flag.  The
single direction conflict set processing code was the only place where
its value was "set".  It seems that the logic that relied on it in
syncer.cc was reversed.  We only processed conflicts if
!conflict_sets_built(), which is the opposite of what the documentation
claims.  Fortunately, its value was always false (because there were no
single direction conflict sets) so we always processed conflicts.

Finally, this CL includes one unrelated change: it removes
BuildAndProcessConflictSetsCommand::MergeSetsForNameClash().  That
function is not defined anywhere, so I decided to remove its
declaration.

BUG=107816
TEST=


Review URL: http://codereview.chromium.org/9107055

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

1 files changed, 0 insertions, 4 deletions

diff --git a/chrome/browser/sync/sessions/status_controller.h b/chrome/browser/sync/sessions/status_controller.h
index 5e397e1..b072577 100644
--- a/chrome/browser/sync/sessions/status_controller.h
+++ b/chrome/browser/sync/sessions/status_controller.h
@@ -138,9 +138,6 @@ class StatusController {
   }
 
   // Control parameters for sync cycles.
-  bool conflict_sets_built() const {
-    return shared_.control_params.conflict_sets_built;
-  }
   bool conflicts_resolved() const {
     return shared_.control_params.conflicts_resolved;
   }
@@ -232,7 +229,6 @@ class StatusController {
   void set_last_process_commit_response_result(const SyncerError result);
 
   void set_commit_set(const OrderedCommitSet& commit_set);
-  void update_conflict_sets_built(bool built);
   void update_conflicts_resolved(bool resolved);
   void reset_conflicts_resolved();
   void set_items_committed();