sync: Merge apply updates and resolve conflicts

sync/sessions/status_controller.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 "sync/sessions/status_controller.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 81 matching lines @@
 }
 
 void StatusController::increment_num_successful_bookmark_commits() {
   model_neutral_.num_successful_bookmark_commits++;
 }
 
 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_hierarchy_conflicts_by(int value) {
+  model_neutral_.num_hierarchy_conflicts += value;
 }
 
 void StatusController::increment_num_server_conflicts() {
   model_neutral_.num_server_conflicts++;
 }
 
-void StatusController::set_num_hierarchy_conflicts(int value) {
-  model_neutral_.num_hierarchy_conflicts = value;
-}
-
 void StatusController::increment_num_local_overwrites() {
   model_neutral_.num_local_overwrites++;
 }
 
 void StatusController::increment_num_server_overwrites() {
   model_neutral_.num_server_overwrites++;
 }
 
 void StatusController::set_sync_protocol_error(
     const SyncProtocolError& error) {
@@ skipping 36 matching lines @@
 }
 
 bool StatusController::HasConflictingUpdates() const {
   return TotalNumConflictingItems() > 0;
 }
 
 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;
 }
 
 int StatusController::num_hierarchy_conflicts() const {
   DCHECK(!group_restriction_in_effect_)
       << "num_hierarchy_conflicts applies to all ModelSafeGroups";
   return model_neutral_.num_hierarchy_conflicts;
 }
 
@@ skipping 42 matching lines @@
 void StatusController::set_debug_info_sent() {
   model_neutral_.debug_info_sent = true;
 }
 
 bool StatusController::debug_info_sent() const {
   return model_neutral_.debug_info_sent;
 }
 
 }  // namespace sessions
 }  // namespace syncer