sync: Merge apply updates and resolve conflicts

sync/sessions/status_controller.h

 // 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.
 
 // StatusController handles all counter and status related number crunching and
 // state tracking on behalf of a SyncSession.  It 'controls' the model data
 // defined in session_state.h.  The most important feature of StatusController
 // is the ScopedModelSafetyRestriction. When one of these is active, the
 // underlying data set exposed via accessors is swapped out to the appropriate
 // set for the restricted ModelSafeGroup behind the scenes.  For example, if
@@ skipping 89 matching lines @@
   int num_server_conflicts() const;
 
   int num_simple_conflicts() const;
 
   // Aggregate sum of all conflicting items over all conflict types.
   int TotalNumConflictingItems() const;
 
   // Number of successfully applied updates.
   int num_updates_applied() const;
 
+  int num_server_overwrites() const;
+
   // Returns the number of updates received from the sync server.
   int64 CountUpdates() const;
 
   // Returns true if the last download_updates_command received a valid
   // server response.
   bool download_updates_succeeded() const {
     return model_neutral_.last_download_updates_result
         == SYNCER_OK;
   }
 
@@ skipping 24 matching lines @@
 
   SyncerError last_get_key_result() const;
 
   // Download counters.
   void set_num_server_changes_remaining(int64 changes_remaining);
   void increment_num_updates_downloaded_by(int value);
   void increment_num_tombstone_updates_downloaded_by(int value);
   void increment_num_reflected_updates_downloaded_by(int value);
 
   // Update application and conflict resolution counters.
-  void increment_num_updates_applied();
-  void increment_num_encryption_conflicts();
+  void increment_num_updates_applied_by(int value);
+  void increment_num_encryption_conflicts_by(int value);
+  void increment_num_hierarchy_conflicts_by(int value);
   void increment_num_server_conflicts();
-  void set_num_hierarchy_conflicts(int value);
   void increment_num_local_overwrites();
   void increment_num_server_overwrites();
 
   // TODO(rlarocque): Remove these after conflict resolution refactor.
   void update_conflicts_resolved(bool resolved);
   void reset_conflicts_resolved();
 
   // Commit counters.
   void increment_num_successful_commits();
   void increment_num_successful_bookmark_commits();
@@ skipping 71 matching lines @@
   }
  private:
   StatusController* status_;
   DISALLOW_COPY_AND_ASSIGN(ScopedModelSafeGroupRestriction);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_STATUS_CONTROLLER_H_