sync: Merge apply updates and resolve conflicts

sync/engine/update_applicator.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.
 //
 // An UpdateApplicator is used to iterate over a number of unapplied updates,
 // applying them to the client using the given syncer session.
 //
 // UpdateApplicator might resemble an iterator, but it actually keeps retrying
 // failed updates until no remaining updates can be successfully applied.
 
@@ skipping 17 matching lines @@
 namespace syncable {
 class WriteTransaction;
 class Entry;
 }
 
 class ConflictResolver;
 class Cryptographer;
 
 class UpdateApplicator {
  public:
-  typedef std::vector<int64>::iterator UpdateIterator;
-
   UpdateApplicator(Cryptographer* cryptographer,
                    const ModelSafeRoutingInfo& routes,
                    ModelSafeGroup group_filter);
   ~UpdateApplicator();
 
   // Attempt to apply the specified updates.
   void AttemptApplications(syncable::WriteTransaction* trans,
-                           const std::vector<int64>& handles,
-                           sessions::StatusController* status);
+                           const std::vector<int64>& handles);
+
+  int updates_applied() {
+    return updates_applied_;
+  }
+
+  int encryption_conflicts() {
+    return encryption_conflicts_;
+  }
+
+  int hierarchy_conflicts() {
+    return hierarchy_conflicts_;
+  }
+
+  const std::set<syncable::Id>& simple_conflict_ids() {
+    return simple_conflict_ids_;
+  }
 
  private:
   // If true, AttemptOneApplication will skip over |entry| and return true.
   bool SkipUpdate(const syncable::Entry& entry);
 
   // Used to decrypt sensitive sync nodes.
   Cryptographer* cryptographer_;
 
   ModelSafeGroup group_filter_;
 
   const ModelSafeRoutingInfo routing_info_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateApplicator);
+
+  int updates_applied_;
+  int encryption_conflicts_;
+  int hierarchy_conflicts_;
+  std::set<syncable::Id> simple_conflict_ids_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_UPDATE_APPLICATOR_H_