sync: Follow-up to conflict resolution refactor

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 41f8fb2f66085f4340a73dbe3fac1e302a3345f4..ad32c065a1a37bb040d5cacd4499ead3e5014f15 100644
--- a/chrome/browser/sync/about_sync_util.cc
+++ b/chrome/browser/sync/about_sync_util.cc
@@ -247,7 +247,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");

[Nicolas Zea, 2012/10/26 21:14:30]

It's not clear to me we shouldn't track this anymore, although perhaps how we
track it should change. It seems to me it's useful to know how many conflicts we
hit this cycle (even if we resolve all of them). 

[rlarocque, 2012/10/26 21:41:46]

Many of the conflict resolution scenarios are covered by other counters, such as
"Conflicts resolved: client wins" and "Conflicts resolved: server wins".  Does
that address your concern?

I suppose we won't track some of the other resolutions (changes match, ignore
encryption), but, to me, those don't seem to be worth tracking.

[Nicolas Zea, 2012/10/26 22:03:27]

Fair enough, I guess those should be sufficient.

   IntSyncStat server_conflicts(section_this_cycle, "Server Conflicts");
   IntSyncStat committed_items(section_this_cycle, "Committed Items");
   IntSyncStat updates_remaining(section_this_cycle, "Updates Remaining");
@@ -263,7 +262,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
@@ -368,7 +366,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);
@@ -377,7 +374,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);
   }