Relieve SyncerSession,SyncCycleState, SyncProcessState, SyncerSession, Syncer...

chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
===================================================================
--- chrome/browser/sync/engine/build_and_process_conflict_sets_command.h	(revision 32731)
+++ chrome/browser/sync/engine/build_and_process_conflict_sets_command.h	(working copy)
@@ -20,40 +20,47 @@
 
 namespace browser_sync {
 
-class ConflictResolutionView;
-class SyncerSession;
+class ConflictResolver;
 
+namespace sessions {
+class ConflictProgress;
+class StatusController;
+}
+
 class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand {
  public:
   BuildAndProcessConflictSetsCommand();
   virtual ~BuildAndProcessConflictSetsCommand();
 
-  virtual void ModelChangingExecuteImpl(SyncerSession* session);
+  // ModelChangingSyncerCommand implementation.
+  virtual void ModelChangingExecuteImpl(sessions::SyncSession* session);
 
  private:
-  bool BuildAndProcessConflictSets(SyncerSession* session);
+  bool BuildAndProcessConflictSets(sessions::SyncSession* session);
 
   bool ProcessSingleDirectionConflictSets(
-      syncable::WriteTransaction* trans, SyncerSession* const session);
+      syncable::WriteTransaction* trans, ConflictResolver* resolver,
+      sessions::StatusController* status);
   bool ApplyUpdatesTransactionally(
       syncable::WriteTransaction* trans,
       const std::vector<syncable::Id>* const update_set,
-      SyncerSession* const session);
+      ConflictResolver* resolver,
+      sessions::StatusController* status);
   void BuildConflictSets(syncable::BaseTransaction* trans,
-                         ConflictResolutionView* view);
+                         sessions::ConflictProgress* conflict_progress);
 
   void MergeSetsForNameClash(syncable::BaseTransaction* trans,
                              syncable::Entry* entry,
-                             ConflictResolutionView* view);
+                             sessions::ConflictProgress* conflict_progress);
   void MergeSetsForIntroducedLoops(syncable::BaseTransaction* trans,
-                                   syncable::Entry* entry,
-                                   ConflictResolutionView* view);
+      syncable::Entry* entry,
+      sessions::ConflictProgress* conflict_progress);
   void MergeSetsForNonEmptyDirectories(syncable::BaseTransaction* trans,
-                                       syncable::Entry* entry,
-                                       ConflictResolutionView* view);
+      syncable::Entry* entry,
+      sessions::ConflictProgress* conflict_progress);
   void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans,
-                                  syncable::Entry* entry,
-                                  ConflictResolutionView* view);
+      syncable::Entry* entry,
+      sessions::ConflictProgress* conflict_progress);
 
   DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand);
 };