sync: Merge apply updates and resolve conflicts

sync/sessions/status_controller.cc

Index: sync/sessions/status_controller.cc
diff --git a/sync/sessions/status_controller.cc b/sync/sessions/status_controller.cc
index f47b085b324f9f0387bc7bdc6ca31fef0913f170..810a8c5d776847ae100145c4109f4f0ad8af490e 100644
--- a/sync/sessions/status_controller.cc
+++ b/sync/sessions/status_controller.cc
@@ -99,20 +99,20 @@ void StatusController::increment_num_successful_commits() {
   model_neutral_.num_successful_commits++;
 }
 
-void StatusController::increment_num_updates_applied() {
-  model_neutral_.num_updates_applied++;
+void StatusController::increment_num_updates_applied_by(int value) {
+  model_neutral_.num_updates_applied += value;
 }
 
-void StatusController::increment_num_encryption_conflicts() {
-  model_neutral_.num_encryption_conflicts++;
+void StatusController::increment_num_encryption_conflicts_by(int value) {
+  model_neutral_.num_encryption_conflicts += value;
 }
 
-void StatusController::increment_num_server_conflicts() {
-  model_neutral_.num_server_conflicts++;
+void StatusController::increment_num_hierarchy_conflicts_by(int value) {
+  model_neutral_.num_hierarchy_conflicts += value;
 }
 
-void StatusController::set_num_hierarchy_conflicts(int value) {
-  model_neutral_.num_hierarchy_conflicts = value;
+void StatusController::increment_num_server_conflicts() {
+  model_neutral_.num_server_conflicts++;
 }
 
 void StatusController::increment_num_local_overwrites() {
@@ -171,6 +171,10 @@ int StatusController::num_updates_applied() const {
   return model_neutral_.num_updates_applied;
 }
 
+int StatusController::num_server_overwrites() const {
+  return model_neutral_.num_server_overwrites;
+}
+
 int StatusController::num_encryption_conflicts() const {
   return model_neutral_.num_encryption_conflicts;
 }