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

chrome/browser/sync/engine/conflict_resolver.cc

 // Copyright (c) 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 entry.
 
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 
 #include <map>
 #include <set>
 
 #include "chrome/browser/sync/engine/syncer.h"
@@ skipping 294 matching lines @@
   // locally_named takes on the ID of the server entry.
   server_named->Put(syncable::ID, trans->directory()->NextId());
   locally_named->Put(syncable::ID, desired_id);
   locally_named->Put(syncable::IS_UNSYNCED, false);
   CopyServerFields(server_named, locally_named);
   ClearServerData(server_named);
   server_named->Put(syncable::IS_DEL, true);
   server_named->Put(syncable::BASE_VERSION, 0);
   CHECK(SUCCESS ==
         SyncerUtil::AttemptToUpdateEntryWithoutMerge(
-            trans, locally_named, NULL, NULL));
+            trans, locally_named, NULL));
   return true;
 }
 
 ConflictResolver::ServerClientNameClashReturn
 ConflictResolver::ProcessServerClientNameClash(WriteTransaction* trans,
                                                MutableEntry* locally_named,
                                                MutableEntry* server_named,
                                                SyncerSession* session) {
   if (!locally_named->ExistsOnClientBecauseDatabaseNameIsNonEmpty())
     return NO_CLASH;  // Locally_named is a server update.
@@ skipping 420 matching lines @@
       conflict_set_count_map_.erase(i++);
       // METRIC self resolved conflict sets ++.
     } else {
       ++i;
     }
   }
   return rv;
 }
 
 }  // namespace browser_sync