Clean up: Modified FileSystemFileUtil::CreateFileEnumerator function signature to return a scoped_ptr.

Return a scoped_ptr to indicate that CreateFileEnumerator is passing the ownership of a heap-allocated object to the caller.

BUG=none
TEST=none


Review URL: https://chromiumcodereview.appspot.com/11293096

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166494 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 9 deletions

diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc
index 1150ec3..35f7110 100644
--- a/webkit/fileapi/local_file_util.cc
+++ b/webkit/fileapi/local_file_util.cc
@@ -134,24 +134,28 @@ PlatformFileError LocalFileUtil::GetFileInfo(
   return error;
 }
 
-FileSystemFileUtil::AbstractFileEnumerator* LocalFileUtil::CreateFileEnumerator(
-    FileSystemOperationContext* context,
-    const FileSystemURL& root_url,
-    bool recursive) {
+scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> LocalFileUtil::
+    CreateFileEnumerator(
+        FileSystemOperationContext* context,
+        const FileSystemURL& root_url,
+        bool recursive) {
   FilePath file_path;
   if (GetLocalFilePath(context, root_url, &file_path) !=
-      base::PLATFORM_FILE_OK)
-    return new EmptyFileEnumerator();
-  return new LocalFileEnumerator(file_path, root_url.path(), recursive,
+      base::PLATFORM_FILE_OK) {
+    return make_scoped_ptr(new EmptyFileEnumerator)
+        .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
+  }
+  return make_scoped_ptr(new LocalFileEnumerator(
+      file_path, root_url.path(), recursive,
       file_util::FileEnumerator::FILES |
-      file_util::FileEnumerator::DIRECTORIES);
+          file_util::FileEnumerator::DIRECTORIES))
+      .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
 }
 
 PlatformFileError LocalFileUtil::GetLocalFilePath(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     FilePath* local_file_path) {
-
   FileSystemMountPointProvider* provider =
       context->file_system_context()->GetMountPointProvider(url.type());
   DCHECK(provider);