drive: Retry update when the entry was trashed during update

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

 // Copyright 2013 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.
 
 #include "chrome/browser/chromeos/drive/sync/entry_update_performer.h"
 
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
@@ skipping 160 matching lines @@
 
 void EntryUpdatePerformer::UpdateEntryAfterFinish(
     const FileOperationCallback& callback,
     const ResourceEntry* entry,
     FileError error) {
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     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;
   }
 
   callback.Run(FILE_ERROR_OK);
 }
 
 }  // namespace internal
 }  // namespace drive