FYI: Move conflict resolve + clean up afterwards

sync/internal_api/public/engine/sync_status.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SYNC_INTERNAL_API_PUBLIC_ENGINE_STATUS_SUMMARY_H_
 #define SYNC_INTERNAL_API_PUBLIC_ENGINE_STATUS_SUMMARY_H_
 
 #include <string>
 
 #include "base/time.h"
@@ skipping 22 matching lines @@
   int notifications_received;
 
   SyncProtocolError sync_protocol_error;
 
   // Number of encryption conflicts counted during most recent sync cycle.
   int encryption_conflicts;
 
   // Number of hierarchy conflicts counted during most recent sync cycle.
   int hierarchy_conflicts;
 
-  // Number of simple conflicts counted during most recent sync cycle.
-  int simple_conflicts;
-
   // Number of items the server refused to commit due to conflict during most
   // recent sync cycle.
   int server_conflicts;
 
   // Number of items successfully committed during most recent sync cycle.
   int committed_count;
 
   bool syncing;
   // True after a client has done a first sync.
   bool initial_sync_ended;
@@ skipping 22 matching lines @@
   int sync_cycles_with_commits;
   int sync_cycles_without_commits;
 
   // Count of useless and useful syncs we perform.
   int useless_sync_cycles;
   int useful_sync_cycles;
 
   // Nudge counts for each possible source
   int nudge_source_notification;
   int nudge_source_local;
-  int nudge_source_continuation;
   int nudge_source_local_refresh;
 
   // Encryption related.
   ModelTypeSet encrypted_types;
   bool cryptographer_ready;
   bool crypto_has_pending_keys;
   bool has_keystore_key;
   base::Time keystore_migration_time;
   PassphraseType passphrase_type;
 
   // Per-datatype throttled status.
   ModelTypeSet throttled_types;
 
   // The unique identifer for this client.
   std::string unique_id;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_ENGINE_STATUS_SUMMARY_H_