FYI: Remove PerModelSafeGroupState + move ConflictResolution

sync/engine/syncer_util.h

 // Copyright (c) 2012 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.
 //
 // Utility functions manipulating syncable::Entries, intended for use by the
 // syncer.
 
 #ifndef SYNC_ENGINE_SYNCER_UTIL_H_
 #define SYNC_ENGINE_SYNCER_UTIL_H_
 
@@ skipping 23 matching lines @@
 // should proceed normally with a new local entry, this function will
 // return server_entry.id(); the caller must create an entry with that
 // ID.  This function does not alter the database.
 syncable::Id FindLocalIdToUpdate(
     syncable::BaseTransaction* trans,
     const sync_pb::SyncEntity& server_entry);
 
 UpdateAttemptResponse AttemptToUpdateEntry(
     syncable::WriteTransaction* const trans,
     syncable::MutableEntry* const entry,
-    ConflictResolver* resolver,
     Cryptographer* cryptographer);
 
 // Pass in name to avoid redundant UTF8 conversion.
 void UpdateServerFieldsFromUpdate(
     syncable::MutableEntry* local_entry,
     const sync_pb::SyncEntity& server_entry,
     const std::string& name);
 
 // Creates a new Entry iff no Entry exists with the given id.
 void CreateNewEntry(syncable::WriteTransaction *trans,
@@ skipping 55 matching lines @@
     syncable::MetahandleSet* inserted_items,
     std::vector<syncable::Id>* commit_ids);
 
 void MarkDeletedChildrenSynced(
     syncable::Directory* dir,
     std::set<syncable::Id>* deleted_folders);
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_SYNCER_UTIL_H_