FYI: Move conflict resolve + clean up afterwards

sync/engine/all_status.cc

Index: sync/engine/all_status.cc
diff --git a/sync/engine/all_status.cc b/sync/engine/all_status.cc
index 82457e466ee3fd07b0a96b4b307d4faf5412246d..9f5de500fa97d7fc61ae51fcece932609a04e084 100644
--- a/sync/engine/all_status.cc
+++ b/sync/engine/all_status.cc
@@ -10,7 +10,6 @@
 #include "base/port.h"
 #include "sync/engine/net/server_connection_manager.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/sessions/session_state.h"
 
 namespace syncer {
 
@@ -31,7 +30,6 @@ SyncStatus AllStatus::CreateBlankStatus() const {
   SyncStatus status = status_;
   status.encryption_conflicts = 0;
   status.hierarchy_conflicts = 0;
-  status.simple_conflicts = 0;
   status.server_conflicts = 0;
   status.committed_count = 0;
   status.initial_sync_ended = false;
@@ -44,7 +42,6 @@ SyncStatus AllStatus::CalcSyncing(const SyncEngineEvent &event) const {
   const sessions::SyncSessionSnapshot& snapshot = event.snapshot;
   status.encryption_conflicts = snapshot.num_encryption_conflicts();
   status.hierarchy_conflicts = snapshot.num_hierarchy_conflicts();
-  status.simple_conflicts = snapshot.num_simple_conflicts();
   status.server_conflicts = snapshot.num_server_conflicts();
   status.committed_count =
       snapshot.model_neutral_state().num_successful_commits;
@@ -62,8 +59,6 @@ SyncStatus AllStatus::CalcSyncing(const SyncEngineEvent &event) const {
       snapshot.model_neutral_state().sync_protocol_error;
 
   // Accumulate update count only once per session to avoid double-counting.
-  // TODO(ncarter): Make this realtime by having the syncer_status
-  // counter preserve its value across sessions.  http://crbug.com/26339
   if (event.what_happened == SyncEngineEvent::SYNC_CYCLE_ENDED) {
     status.updates_received +=
         snapshot.model_neutral_state().num_updates_downloaded_total;
@@ -186,9 +181,6 @@ void AllStatus::IncrementNudgeCounter(NudgeSource source) {
     case NUDGE_SOURCE_NOTIFICATION:
       status_.nudge_source_notification++;
       return;
-    case NUDGE_SOURCE_CONTINUATION:
-      status_.nudge_source_continuation++;
-      return;
     case NUDGE_SOURCE_UNKNOWN:
       break;
   }