| Index: chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
|
| index e36e3e2417cd4fd3ffc34d55520ba746209bcc5f..a023b75c3d048561fbb9e80b9de00bf23af2075d 100644
|
| --- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
|
| @@ -288,7 +288,7 @@ TEST_F(NativeMediaFileUtilTest, CopySourceFiltering) {
|
| for (size_t i = 0; i < arraysize(kFilteringTestCases); ++i) {
|
| // Always start with an empty destination directory.
|
| // Copying to a non-empty destination directory is an invalid operation.
|
| - ASSERT_TRUE(base::Delete(dest_path, true));
|
| + ASSERT_TRUE(base::DeleteFile(dest_path, true));
|
| ASSERT_TRUE(file_util::CreateDirectory(dest_path));
|
|
|
| FileSystemURL root_url = CreateURL(FPL(""));
|
| @@ -318,7 +318,7 @@ TEST_F(NativeMediaFileUtilTest, CopyDestFiltering) {
|
| if (loop_count == 1) {
|
| // Reset the test directory between the two loops to remove old
|
| // directories and create new ones that should pre-exist.
|
| - ASSERT_TRUE(base::Delete(root_path(), true));
|
| + ASSERT_TRUE(base::DeleteFile(root_path(), true));
|
| ASSERT_TRUE(file_util::CreateDirectory(root_path()));
|
| PopulateDirectoryWithTestCases(root_path(),
|
| kFilteringTestCases,
|
| @@ -387,7 +387,7 @@ TEST_F(NativeMediaFileUtilTest, MoveSourceFiltering) {
|
| for (size_t i = 0; i < arraysize(kFilteringTestCases); ++i) {
|
| // Always start with an empty destination directory.
|
| // Moving to a non-empty destination directory is an invalid operation.
|
| - ASSERT_TRUE(base::Delete(dest_path, true));
|
| + ASSERT_TRUE(base::DeleteFile(dest_path, true));
|
| ASSERT_TRUE(file_util::CreateDirectory(dest_path));
|
|
|
| FileSystemURL root_url = CreateURL(FPL(""));
|
| @@ -417,7 +417,7 @@ TEST_F(NativeMediaFileUtilTest, MoveDestFiltering) {
|
| if (loop_count == 1) {
|
| // Reset the test directory between the two loops to remove old
|
| // directories and create new ones that should pre-exist.
|
| - ASSERT_TRUE(base::Delete(root_path(), true));
|
| + ASSERT_TRUE(base::DeleteFile(root_path(), true));
|
| ASSERT_TRUE(file_util::CreateDirectory(root_path()));
|
| PopulateDirectoryWithTestCases(root_path(),
|
| kFilteringTestCases,
|
|
|