diff options
3 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/drive/fake_drive_service.cc b/chrome/browser/drive/fake_drive_service.cc index c763895..6ea4bf8 100644 --- a/chrome/browser/drive/fake_drive_service.cc +++ b/chrome/browser/drive/fake_drive_service.cc @@ -1450,7 +1450,8 @@ base::DictionaryValue* FakeDriveService::FindEntryByResourceId( std::string current_resource_id; if (entries->GetDictionary(i, &entry) && entry->GetString("gd$resourceId.$t", ¤t_resource_id) && - resource_id == current_resource_id) { + resource_id == current_resource_id && + !entry->HasKey("docs$removed")) { return entry; } } diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc index 6b031d5..655b881 100644 --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc @@ -412,7 +412,7 @@ TEST_F(LocalToRemoteSyncerTest, Conflict_UpdateDeleteOnFile) { DeleteResource(file_id); - EXPECT_EQ(SYNC_STATUS_RETRY, RunLocalToRemoteSyncer( + EXPECT_EQ(SYNC_STATUS_FILE_BUSY, RunLocalToRemoteSyncer( FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE, SYNC_FILE_TYPE_FILE), URL(kOrigin, "foo"))); diff --git a/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.cc b/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.cc index 2a76c00..71d1325 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.cc @@ -49,12 +49,10 @@ void DidGetResourceEntryForUploadExisting( const UploadCompletionCallback& callback, GDataErrorCode error, scoped_ptr<ResourceEntry> entry) { - ASSERT_EQ(google_apis::HTTP_SUCCESS, error); - ASSERT_TRUE(entry); base::MessageLoopProxy::current()->PostTask( FROM_HERE, base::Bind(callback, - google_apis::HTTP_SUCCESS, + error, GURL(), base::Passed(&entry))); } |