sync: Follow-up to conflict resolution refactor

sync/engine/syncer.cc

Index: sync/engine/syncer.cc
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc
index 2b38501a7477cf395491751c7e25761484664f0c..22010eee2fade94630b2960f9932d0925cd3e3e7 100644
--- a/sync/engine/syncer.cc
+++ b/sync/engine/syncer.cc
@@ -36,7 +36,6 @@ using sync_pb::ClientCommand;
 
 namespace syncer {
 
-using sessions::ScopedSessionContextConflictResolver;
 using sessions::StatusController;
 using sessions::SyncSession;
 using syncable::IS_UNAPPLIED_UPDATE;
@@ -86,8 +85,6 @@ void Syncer::RequestEarlyExit() {
 bool Syncer::SyncShare(sessions::SyncSession* session,
                        SyncerStep first_step,
                        SyncerStep last_step) {
-  ScopedSessionContextConflictResolver scoped(session->context(),
-                                              &resolver_);
   session->mutable_status_controller()->UpdateStartTime();
   SyncerStep current_step = first_step;