FYI: Move conflict resolve + clean up afterwards

chrome/browser/sync/about_sync_util.cc

 // 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.
 
 #include "chrome/browser/sync/about_sync_util.h"
 
 #include <string>
 
 #include "base/string16.h"
 #include "base/values.h"
@@ skipping 226 matching lines @@
   IntSyncStat successful_commits(section_counters, "Successful Commits");
   IntSyncStat conflicts_resolved_local_wins(section_counters,
                                      "Conflicts Resolved: Client Wins");
   IntSyncStat conflicts_resolved_server_wins(section_counters,
                                       "Conflicts Resolved: Server Wins");
 
   ListValue *section_this_cycle = AddSection(stats_list,
                                              "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");
 
   ListValue* section_that_cycle = AddSection(
       stats_list, "Transient Counters (last cycle of last completed session)");
   IntSyncStat updates_downloaded(section_that_cycle, "Updates Downloaded");
   IntSyncStat committed_count(section_that_cycle, "Committed Count");
   IntSyncStat entries(section_that_cycle, "Entries");
 
   ListValue* section_nudge_info = AddSection(
       stats_list, "Nudge Source Counters");
   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
   // message.
   about_info->Set("details", stats_list);
 
   // Populate all the fields we declared above.
   client_version.SetValue(GetVersionString());
 
   if (!service) {
@@ skipping 84 matching lines @@
     successful_commits.SetValue(full_status.num_commits_total);
     conflicts_resolved_local_wins.SetValue(
         full_status.num_local_overwrites_total);
     conflicts_resolved_server_wins.SetValue(
         full_status.num_server_overwrites_total);
   }
 
   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);
   }
 
   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);
   }
 
   if (snapshot.is_initialized()) {
     updates_downloaded.SetValue(
         snapshot.model_neutral_state().num_updates_downloaded_total);
     committed_count.SetValue(
         snapshot.model_neutral_state().num_successful_commits);
     entries.SetValue(snapshot.num_entries());
   }
@@ skipping 44 matching lines @@
     about_info->SetString("unrecoverable_error_message",
                        unrecoverable_error_message);
   }
 
   about_info->Set("type_status", service->GetTypeStatusMap());
 
   return about_info.Pass();
 }
 
 }  // namespace sync_ui_util