FYI: Move conflict resolve + clean up afterwards

chrome/browser/sync/about_sync_util.cc

Index: chrome/browser/sync/about_sync_util.cc
diff --git a/chrome/browser/sync/about_sync_util.cc b/chrome/browser/sync/about_sync_util.cc
index b50a583f8bdc8f2b66148433b35c129e81a50ebf..f84e47a3c268e7fc8279c09ff0833940ec6e2518 100644
--- a/chrome/browser/sync/about_sync_util.cc
+++ b/chrome/browser/sync/about_sync_util.cc
@@ -244,7 +244,6 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
                                              "Transient Counters (this cycle)");
   IntSyncStat encryption_conflicts(section_this_cycle, "Encryption Conflicts");
   IntSyncStat hierarchy_conflicts(section_this_cycle, "Hierarchy Conflicts");
-  IntSyncStat simple_conflicts(section_this_cycle, "Simple Conflicts");
   IntSyncStat server_conflicts(section_this_cycle, "Server Conflicts");
   IntSyncStat committed_items(section_this_cycle, "Committed Items");
   IntSyncStat updates_remaining(section_this_cycle, "Updates Remaining");
@@ -260,7 +259,6 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   IntSyncStat nudge_source_notification(
       section_nudge_info, "Server Invalidations");
   IntSyncStat nudge_source_local(section_nudge_info, "Local Changes");
-  IntSyncStat nudge_source_continuation(section_nudge_info, "Continuations");
   IntSyncStat nudge_source_local_refresh(section_nudge_info, "Local Refreshes");
 
   // This list of sections belongs in the 'details' field of the returned
@@ -365,7 +363,6 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   if (is_status_valid) {
     encryption_conflicts.SetValue(full_status.encryption_conflicts);
     hierarchy_conflicts.SetValue(full_status.hierarchy_conflicts);
-    simple_conflicts.SetValue(full_status.simple_conflicts);
     server_conflicts.SetValue(full_status.server_conflicts);
     committed_items.SetValue(full_status.committed_count);
     updates_remaining.SetValue(full_status.updates_available);
@@ -374,7 +371,6 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   if (is_status_valid) {
     nudge_source_notification.SetValue(full_status.nudge_source_notification);
     nudge_source_local.SetValue(full_status.nudge_source_local);
-    nudge_source_continuation.SetValue(full_status.nudge_source_continuation);
     nudge_source_local_refresh.SetValue(full_status.nudge_source_local_refresh);
   }