FYI: Remove PerModelSafeGroupState + move ConflictResolution

sync/internal_api/public/sessions/model_neutral_state.h

Index: sync/internal_api/public/sessions/model_neutral_state.h
diff --git a/sync/internal_api/public/sessions/model_neutral_state.h b/sync/internal_api/public/sessions/model_neutral_state.h
index c1d8862a3c079c257af9cc2b3e1145d6a4106556..de0ab64cf2ca616cc067b951ab2d15e6c641797b 100644
--- a/sync/internal_api/public/sessions/model_neutral_state.h
+++ b/sync/internal_api/public/sessions/model_neutral_state.h
@@ -41,6 +41,12 @@ struct ModelNeutralState {
   // the client must now "migrate", by purging and re-downloading all updates.
   ModelTypeSet types_needing_local_migration;
 
+  // Update application and conflicts.
+  int num_updates_applied;
+  int num_encryption_conflicts;
+  int num_server_conflicts;
+  int num_hierarchy_conflicts;
+
   // Overwrites due to conflict resolution counters.
   int num_local_overwrites;
   int num_server_overwrites;
@@ -54,9 +60,6 @@ struct ModelNeutralState {
   SyncerError last_download_updates_result;
   SyncerError commit_result;
 
-  // Set to true by ResolveConflictsCommand if any forward progress was made.
-  bool conflicts_resolved;
-
   // Set to true by PostCommitMessageCommand if any commits were successful.
   bool items_committed;