| Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
|
| 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 6b031d5ded97924cb326b810276b64d0918ce8aa..655b881f014e6315a3922328e2fb64dbe67d46e7 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")));
|
|
|