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

chrome/browser/sync/engine/apply_updates_command.cc

Index: chrome/browser/sync/engine/apply_updates_command.cc
===================================================================
--- chrome/browser/sync/engine/apply_updates_command.cc	(revision 32731)
+++ chrome/browser/sync/engine/apply_updates_command.cc	(working copy)
@@ -4,19 +4,22 @@
 
 #include "chrome/browser/sync/engine/apply_updates_command.h"
 
-#include "chrome/browser/sync/engine/syncer_session.h"
 #include "chrome/browser/sync/engine/update_applicator.h"
+#include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/util/sync_types.h"
 
 namespace browser_sync {
 
+using sessions::SyncSession;
+
 ApplyUpdatesCommand::ApplyUpdatesCommand() {}
 ApplyUpdatesCommand::~ApplyUpdatesCommand() {}
 
-void ApplyUpdatesCommand::ModelChangingExecuteImpl(SyncerSession *session) {
-  syncable::ScopedDirLookup dir(session->dirman(), session->account_name());
+void ApplyUpdatesCommand::ModelChangingExecuteImpl(SyncSession* session) {
+  syncable::ScopedDirLookup dir(session->context()->directory_manager(),
+                                session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
     return;
@@ -25,10 +28,12 @@
   syncable::Directory::UnappliedUpdateMetaHandles handles;
   dir->GetUnappliedUpdateMetaHandles(&trans, &handles);
 
-  UpdateApplicator applicator(session->resolver(), handles.begin(),
+  UpdateApplicator applicator(session->context()->resolver(), handles.begin(),
                               handles.end());
   while (applicator.AttemptOneApplication(&trans)) {}
-  applicator.SaveProgressIntoSessionState(session);
+  applicator.SaveProgressIntoSessionState(
+      session->status_controller()->mutable_conflict_progress(),
+      session->status_controller()->mutable_update_progress());
 }
 
 }  // namespace browser_sync