Remove single direction conflict set code

chrome/browser/sync/sessions/session_state.h

Index: chrome/browser/sync/sessions/session_state.h
diff --git a/chrome/browser/sync/sessions/session_state.h b/chrome/browser/sync/sessions/session_state.h
index 4020b0c888ab4ffda7dac3b47333e64caa619306..ce1f4628f8549daddbd571e7b84b54fed3df78a3 100644
--- a/chrome/browser/sync/sessions/session_state.h
+++ b/chrome/browser/sync/sessions/session_state.h
@@ -258,14 +258,9 @@ class UpdateProgress {
 };
 
 struct SyncCycleControlParameters {
-  SyncCycleControlParameters() : conflict_sets_built(false),
-                                 conflicts_resolved(false),
+  SyncCycleControlParameters() : conflicts_resolved(false),
                                  items_committed(false),
                                  debug_info_sent(false) {}
-  // Set to true by BuildAndProcessConflictSetsCommand if the RESOLVE_CONFLICTS
-  // step is needed.
-  bool conflict_sets_built;
-
   // Set to true by ResolveConflictsCommand if any forward progress was made.
   bool conflicts_resolved;