Remove context-based dependencies on SyncerSession from ApplyUpdatesCommand....

chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

 // Copyright (c) 2006-2009 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.
 
 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h"
 
 #include <string>
 #include <sstream>
 #include <vector>
 
@@ skipping 200 matching lines @@
   // 4. Use the preparer to move things to an initial starting state where no
   // names collide, and nothing in the set is a child of anything else.  If
   // we've correctly calculated the set, the server tree is valid and no
   // changes have occurred locally we should be able to apply updates from this
   // state.
   TransactionalUpdateEntryPreparer preparer;
   preparer.PrepareEntries(trans, update_set);
 
   // 5. Use the usual apply updates from the special start state we've just
   // prepared.
-  UpdateApplicator applicator(session, handles.begin(), handles.end());
+  UpdateApplicator applicator(session->resolver(), handles.begin(),
+                              handles.end());
   while (applicator.AttemptOneApplication(trans)) {
     // Keep going till all updates are applied.
   }
   if (!applicator.AllUpdatesApplied()) {
     LOG(ERROR) << "Transactional Apply Failed, Rolling back.";
     // We have to move entries into the temp dir again. e.g. if a swap was in a
     // set with other failing updates, the swap may have gone through, meaning
     // the roll back needs to be transactional. But as we're going to a known
     // good state we should always succeed.
     preparer.PrepareEntries(trans, update_set);
 
     // Rollback all entries.
     for (size_t i = 0; i < rollback_data.size(); ++i) {
       CHECK(RollbackEntry(trans, &rollback_data[i]));
     }
     return false;  // Don't save progress -- we just undid it.
   }
-  applicator.SaveProgressIntoSessionState();
+  applicator.SaveProgressIntoSessionState(session);
   return true;
 }
 
 void BuildAndProcessConflictSetsCommand::BuildConflictSets(
     syncable::BaseTransaction* trans,
     ConflictResolutionView* view) {
   view->CleanupSets();
   set<syncable::Id>::iterator i = view->CommitConflictsBegin();
   while (i != view->CommitConflictsEnd()) {
     syncable::Entry entry(trans, syncable::GET_BY_ID, *i);
@@ skipping 182 matching lines @@
       return;
     LocallyDeletedPathChecker checker;
     if (!checker.CausingConflict(parent, *entry))
       return;
     view->MergeSets(entry->Get(syncable::ID), parent.Get(syncable::ID));
     CrawlDeletedTreeMergingSets(trans, parent, view, checker);
   }
 }
 
 }  // namespace browser_sync