FYI: Remove PerModelSafeGroupState + move ConflictResolution

sync/sessions/test_util.cc

Index: sync/sessions/test_util.cc
diff --git a/sync/sessions/test_util.cc b/sync/sessions/test_util.cc
index 4214c3d44bd16afffce64550ddede6a4e4ff3e14..1eb67b79274cfc8c41d985c6be46e0075e75f90c 100644
--- a/sync/sessions/test_util.cc
+++ b/sync/sessions/test_util.cc
@@ -8,12 +8,6 @@ namespace syncer {
 namespace sessions {
 namespace test_util {
 
-void SimulateHasMoreToSync(sessions::SyncSession* session,
-                           SyncerStep begin, SyncerStep end) {
-  session->mutable_status_controller()->update_conflicts_resolved(true);
-  ASSERT_TRUE(session->HasMoreToSync());
-}
-
 void SimulateGetEncryptionKeyFailed(sessions::SyncSession* session,
                                     SyncerStep begin, SyncerStep end) {
   session->mutable_status_controller()->set_last_get_key_result(
@@ -43,9 +37,6 @@ void SimulateConnectionFailure(sessions::SyncSession* session,
 
 void SimulateSuccess(sessions::SyncSession* session,
                      SyncerStep begin, SyncerStep end) {
-  if (session->HasMoreToSync()) {
-    ADD_FAILURE() << "Shouldn't have more to sync";
-  }
   ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
   session->SetFinished();
   switch(end) {