FYI: Remove PerModelSafeGroupState + move ConflictResolution

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 7e5be74221227559219e7d759d4f89d49b3ab677..32c590cf876d6750125476eb840e16d068fea4b5 100644
--- a/sync/engine/conflict_resolver.h
+++ b/sync/engine/conflict_resolver.h
@@ -28,7 +28,6 @@ class WriteTransaction;
 class Cryptographer;
 
 namespace sessions {
-class ConflictProgress;
 class StatusController;
 }  // namespace sessions
 
@@ -56,7 +55,7 @@ class ConflictResolver {
   // Returns true if the syncer should try to apply its updates again.
   bool ResolveConflicts(syncable::WriteTransaction* trans,
                         const Cryptographer* cryptographer,
-                        const sessions::ConflictProgress& progress,
+                        const std::set<syncable::Id>& simple_conflict_ids,
                         sessions::StatusController* status);
 
  private:
@@ -71,11 +70,6 @@ class ConflictResolver {
       const Cryptographer* cryptographer,
       sessions::StatusController* status);
 
-  bool ResolveSimpleConflicts(syncable::WriteTransaction* trans,
-                              const Cryptographer* cryptographer,
-                              const sessions::ConflictProgress& progress,
-                              sessions::StatusController* status);
-
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };