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

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(&param)));
 }