Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/internal_api/debug_info_event_listener.cc

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More renames, refactors and fixes Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/sync/engine/apply_updates_command_unittest.cc ('K') | « chrome/browser/sync/engine/update_applicator.cc ('k') | chrome/browser/sync/profile_sync_service_harness.cc » ('j') | chrome/browser/sync/sessions/status_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/internal_api/debug_info_event_listener.cc
diff --git a/chrome/browser/sync/internal_api/debug_info_event_listener.cc b/chrome/browser/sync/internal_api/debug_info_event_listener.cc
index d783deea2af512863963ffb6a4a1b62204027142..8c49eb59bbe36f16891bd1041a7d990bf8c86b16 100644
--- a/chrome/browser/sync/internal_api/debug_info_event_listener.cc
+++ b/chrome/browser/sync/internal_api/debug_info_event_listener.cc
@@ -23,10 +23,11 @@ void DebugInfoEventListener::OnSyncCycleCompleted(
sync_pb::SyncCycleCompletedEventInfo* sync_completed_event_info =
event_info.mutable_sync_cycle_completed_event_info();
+ // TODO(rlarocque): These counters are reversed. We should fix this bug.
sync_completed_event_info->set_num_blocking_conflicts(
snapshot->num_conflicting_updates);
sync_completed_event_info->set_num_non_blocking_conflicts(
- snapshot->num_blocking_conflicting_updates);
+ snapshot->num_simple_conflicting_updates);
AddEventToQueue(event_info);
}
« chrome/browser/sync/engine/apply_updates_command_unittest.cc ('K') | « chrome/browser/sync/engine/update_applicator.cc ('k') | chrome/browser/sync/profile_sync_service_harness.cc » ('j') | chrome/browser/sync/sessions/status_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698