diff options
author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-08 00:58:40 +0000 |
---|---|---|
committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-08 00:58:40 +0000 |
commit | 49a03ec83aed48aa561469a69410893c1a780586 (patch) | |
tree | dae99ed96720b0c7de0b6472699a81634728ab95 /chrome/browser/sync_file_system/drive_file_sync_service.cc | |
parent | 0c92b0d1079123c39f6e8fbd7eb3ff6503e9bccd (diff) | |
download | chromium_src-49a03ec83aed48aa561469a69410893c1a780586.zip chromium_src-49a03ec83aed48aa561469a69410893c1a780586.tar.gz chromium_src-49a03ec83aed48aa561469a69410893c1a780586.tar.bz2 |
SyncFileSystem: Prevent repeated conflict on DriveFileSyncService::ResolveConflictToLocal.
- Drop metadata of the resolved file to prevent repeated conflit.
- Allow ClearChangesForURL for non-changed URL, to prevent DCHECK hit.
BUG=164335
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/11464024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync_file_system/drive_file_sync_service.cc')
-rw-r--r-- | chrome/browser/sync_file_system/drive_file_sync_service.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc index 5606d93..d5ad1d3 100644 --- a/chrome/browser/sync_file_system/drive_file_sync_service.cc +++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc @@ -1259,12 +1259,9 @@ void DriveFileSyncService::DidResolveConflictToLocalChange( return; } - const DriveMetadata& metadata = param->drive_metadata; - param->drive_metadata.set_conflicted(false); const fileapi::FileSystemURL& url = param->remote_change.url; - - metadata_store_->UpdateEntry( - url, metadata, + metadata_store_->DeleteEntry( + url, base::Bind(&DriveFileSyncService::CompleteRemoteSync, AsWeakPtr(), base::Passed(¶m))); } |