sync: Merge apply updates and resolve conflicts

sync/engine/conflict_resolver.h

Index: sync/engine/conflict_resolver.h
diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h
index 554d2e0baf2a727a2b283bb142e367a15e61d591..4ca614ddac68da7dc8b5e8ac62a4e47c3a313150 100644
--- a/sync/engine/conflict_resolver.h
+++ b/sync/engine/conflict_resolver.h
@@ -49,18 +49,13 @@ class ConflictResolver {
   ~ConflictResolver();
   // Called by the syncer at the end of a update/commit cycle.
   // Returns true if the syncer should try to apply its updates again.
-  bool ResolveConflicts(syncable::WriteTransaction* trans,
+  void ResolveConflicts(syncable::WriteTransaction* trans,
                         const Cryptographer* cryptographer,
                         const std::set<syncable::Id>& simple_conflict_ids,
                         sessions::StatusController* status);
 
  private:
-  enum ProcessSimpleConflictResult {
-    NO_SYNC_PROGRESS,  // No changes to advance syncing made.
-    SYNC_PROGRESS,     // Progress made.
-  };
-
-  ProcessSimpleConflictResult ProcessSimpleConflict(
+  void ProcessSimpleConflict(
       syncable::WriteTransaction* trans,
       const syncable::Id& id,
       const Cryptographer* cryptographer,