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

chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
===================================================================
--- chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc	(revision 30625)
+++ chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc	(working copy)
@@ -218,7 +218,8 @@
 
   // 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.
   }
@@ -236,7 +237,7 @@
     }
     return false;  // Don't save progress -- we just undid it.
   }
-  applicator.SaveProgressIntoSessionState();
+  applicator.SaveProgressIntoSessionState(session);
   return true;
 }