sync: Merge apply updates and resolve conflicts

sync/sessions/status_controller.h

Index: sync/sessions/status_controller.h
diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h
index 1465dbfdf64afc9f16a9e171dc78c5fa5202f90f..0717b6eb0fed1472009966aed2276c9a3afec839 100644
--- a/sync/sessions/status_controller.h
+++ b/sync/sessions/status_controller.h
@@ -107,6 +107,8 @@ class StatusController {
   // 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;
 
@@ -151,10 +153,10 @@ class StatusController {
   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();