ResolveConflicts   52 sync/engine/conflict_resolver.h   void ResolveConflicts(syncable::WriteTransaction* trans,
ResolveConflicts  115 sync/engine/directory_update_handler.cc     resolver.ResolveConflicts(&trans,