diff --git a/storage/browser/file_system/obfuscated_file_util.cc b/storage/browser/file_system/obfuscated_file_util.cc index 4919b1771fd26..092b4b0bc1ee3 100644 --- a/storage/browser/file_system/obfuscated_file_util.cc +++ b/storage/browser/file_system/obfuscated_file_util.cc @@ -793,7 +793,7 @@ base::File::Error ObfuscatedFileUtil::DeleteDirectory( return base::File::FILE_ERROR_NOT_FOUND; if (!file_id) { // Cannot remove the root directory. - return base::File::FILE_ERROR_FAILED; + return base::File::FILE_ERROR_ACCESS_DENIED; } FileInfo file_info; if (!db->GetFileInfo(file_id, &file_info)) { diff --git a/third_party/blink/web_tests/external/wpt/file-system-access/sandboxed_FileSystemBaseHandle-remove.https.any.js b/third_party/blink/web_tests/external/wpt/file-system-access/sandboxed_FileSystemBaseHandle-remove.https.any.js index 6044f65ae6b21..19c48df438f00 100644 --- a/third_party/blink/web_tests/external/wpt/file-system-access/sandboxed_FileSystemBaseHandle-remove.https.any.js +++ b/third_party/blink/web_tests/external/wpt/file-system-access/sandboxed_FileSystemBaseHandle-remove.https.any.js @@ -1,7 +1,3 @@ // META: script=resources/test-helpers.js // META: script=../fs/resources/sandboxed-fs-test-helpers.js // META: script=script-tests/FileSystemBaseHandle-remove.js - -directory_test(async (t, root) => { - await promise_rejects_dom(t, 'InvalidStateError', root.remove()); -}, 'cannot remove the root of a sandbox file system'); diff --git a/third_party/blink/web_tests/external/wpt/file-system-access/script-tests/FileSystemBaseHandle-remove.js b/third_party/blink/web_tests/external/wpt/file-system-access/script-tests/FileSystemBaseHandle-remove.js index 2306bde7cdb87..95196db62b3c8 100644 --- a/third_party/blink/web_tests/external/wpt/file-system-access/script-tests/FileSystemBaseHandle-remove.js +++ b/third_party/blink/web_tests/external/wpt/file-system-access/script-tests/FileSystemBaseHandle-remove.js @@ -91,3 +91,8 @@ directory_test(async (t, root) => { assert_array_equals(await getSortedDirectoryEntries(root), ['file-to-keep']); await promise_rejects_dom(t, 'NotFoundError', getFileContents(handle)); }, 'remove() while the file has an open writable fails'); + +promise_test(async (t) => { + const root = await navigator.storage.getDirectory(); + await promise_rejects_dom(t, 'NoModificationAllowedError', root.remove()); +}, 'cannot remove the root of a sandbox file system');