diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 05:11:35 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 05:11:35 +0000 |
| commit | c035710fdb1eec3d52d33f0d32a3761d060ca89b (patch) | |
| tree | eb3eca791153db70a1fb1e715da7cbc813f3b8f5 /chrome/browser/sync_file_system | |
| parent | c2d2f0ed5e808f74b5d815a3b5fee18e3aeb49a9 (diff) | |
| download | chromium_src-c035710fdb1eec3d52d33f0d32a3761d060ca89b.zip chromium_src-c035710fdb1eec3d52d33f0d32a3761d060ca89b.tar.gz chromium_src-c035710fdb1eec3d52d33f0d32a3761d060ca89b.tar.bz2 | |
Don't DCHECK on directory changes if IsSyncDirectoryOperationEnabled()
BUG=none
TEST=manual
R=calvinlo@chromium.org, nhiroki@chromium.org, tzik@chromium.org
Review URL: https://codereview.chromium.org/14677004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync_file_system')
| -rw-r--r-- | chrome/browser/sync_file_system/drive_file_sync_service.cc | 3 |
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")); |