drive: Retry update when the entry was trashed during update

chrome/browser/chromeos/drive/sync/entry_update_performer.cc

Index: chrome/browser/chromeos/drive/sync/entry_update_performer.cc
diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
index ec25ef6131048fb4f8c0f071bab59a1dd28b654d..bf7b279fe3aaee0e3e773473b9b15536f8804c8f 100644
--- a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
@@ -178,7 +178,8 @@ void EntryUpdatePerformer::UpdateEntryAfterFinish(
     return;
   }
 
-  if (entry->metadata_edit_state() == ResourceEntry::DIRTY) {
+  if (entry->metadata_edit_state() == ResourceEntry::DIRTY ||
+      entry->parent_local_id() == util::kDriveTrashDirLocalId) {
     // The entry was edited during the update. Update again.
     UpdateEntry(entry->local_id(), callback);
     return;