summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi/native_file_util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/fileapi/native_file_util.cc')
-rw-r--r--webkit/fileapi/native_file_util.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/webkit/fileapi/native_file_util.cc b/webkit/fileapi/native_file_util.cc
index 995a9e9..934d0b7 100644
--- a/webkit/fileapi/native_file_util.cc
+++ b/webkit/fileapi/native_file_util.cc
@@ -155,12 +155,14 @@ PlatformFileError NativeFileUtil::GetFileInfo(
return base::PLATFORM_FILE_OK;
}
-FileSystemFileUtil::AbstractFileEnumerator*
-NativeFileUtil::CreateFileEnumerator(const FilePath& root_path,
- bool recursive) {
- return new NativeFileEnumerator(root_path, recursive,
+scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
+ NativeFileUtil::CreateFileEnumerator(const FilePath& root_path,
+ bool recursive) {
+ return make_scoped_ptr(new NativeFileEnumerator(
+ root_path, recursive,
file_util::FileEnumerator::FILES |
- file_util::FileEnumerator::DIRECTORIES);
+ file_util::FileEnumerator::DIRECTORIES))
+ .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
}
PlatformFileError NativeFileUtil::Touch(
@@ -204,9 +206,9 @@ bool NativeFileUtil::IsDirectoryEmpty(const FilePath& path) {
}
PlatformFileError NativeFileUtil::CopyOrMoveFile(
- const FilePath& src_path,
- const FilePath& dest_path,
- bool copy) {
+ const FilePath& src_path,
+ const FilePath& dest_path,
+ bool copy) {
if (copy) {
if (file_util::CopyFile(src_path,
dest_path))