FYI: Move conflict resolve + clean up afterwards

chrome/browser/sync/profile_sync_service_harness.cc

Index: chrome/browser/sync/profile_sync_service_harness.cc
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
index 58d31db0b99c7e7e473d9db0dcb693282fd40f89..59e01a262847425b4c96d3f68c890f9a88dbe1db 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -763,11 +763,9 @@ ProfileSyncService::Status ProfileSyncServiceHarness::GetStatus() {
 // while ensuring that all conditions are evaluated using on the same snapshot.
 bool ProfileSyncServiceHarness::IsDataSyncedImpl(
     const SyncSessionSnapshot& snap) {
-  return snap.num_simple_conflicts() == 0 &&
-         ServiceIsPushingChanges() &&
+  return ServiceIsPushingChanges() &&
          GetStatus().notifications_enabled &&
          !service()->HasUnsyncedItems() &&
-         !snap.has_more_to_sync() &&
          !HasPendingBackendMigration();
 }
 
@@ -999,9 +997,7 @@ std::string ProfileSyncServiceHarness::GetClientInfoString(
     const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
     const ProfileSyncService::Status& status = GetStatus();
     // Capture select info from the sync session snapshot and syncer status.
-    os << "has_more_to_sync: "
-       << snap.has_more_to_sync()
-       << ", has_unsynced_items: "
+    os << ", has_unsynced_items: "
        << (service()->sync_initialized() ? service()->HasUnsyncedItems() : 0)
        << ", did_commit: "
        << (snap.model_neutral_state().num_successful_commits == 0 &&
@@ -1010,8 +1006,6 @@ std::string ProfileSyncServiceHarness::GetClientInfoString(
        << snap.num_encryption_conflicts()
        << ", hierarchy conflicts: "
        << snap.num_hierarchy_conflicts()
-       << ", simple conflicts: "
-       << snap.num_simple_conflicts()
        << ", server conflicts: "
        << snap.num_server_conflicts()
        << ", num_updates_downloaded : "