summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync_file_system
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync_file_system')
-rw-r--r--chrome/browser/sync_file_system/drive_file_sync_service.cc3
1 files changed, 2 insertions, 1 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 ebcc6e0f..26e24b8 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -573,7 +573,8 @@ void DriveFileSyncService::ApplyLocalChange(
const FileSystemURL& url,
const SyncStatusCallback& callback) {
// TODO(nhiroki): support directory operations (http://crbug.com/161442).
- DCHECK(!local_file_change.IsDirectory());
+ DCHECK(IsSyncDirectoryOperationEnabled() ||
+ !local_file_change.IsDirectory());
scoped_ptr<TaskToken> token(GetToken(
FROM_HERE, TASK_TYPE_DATABASE, "Apply local change"));