Make FileSystemOperation NOT self-destruct

chrome/browser/media_galleries/fileapi/native_media_file_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/string_util.h"
@@ skipping 115 matching lines @@
   if (StartsWithASCII(mime_type, "image/", true) ||
       StartsWithASCII(mime_type, "audio/", true) ||
       StartsWithASCII(mime_type, "video/", true) ||
       mime_type == "application/x-shockwave-flash") {
     return base::PLATFORM_FILE_OK;
   }
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 bool NativeMediaFileUtil::CreateOrOpen(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     int file_flags,
     const CreateOrOpenCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   // Only called by NaCl, which should not have access to media file systems.
   base::PlatformFile invalid_file(base::kInvalidPlatformFileValue);
   if (!callback.is_null()) {
     callback.Run(base::PLATFORM_FILE_ERROR_SECURITY,
                  base::PassPlatformFile(&invalid_file),
                  false);
   }
   return true;
 }
 
 bool NativeMediaFileUtil::EnsureFileExists(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     const EnsureFileExistsCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (!callback.is_null())
     callback.Run(base::PLATFORM_FILE_ERROR_SECURITY, false);
   return true;
 }
 
 bool NativeMediaFileUtil::CreateDirectory(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     bool exclusive,
     bool recursive,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return context->task_runner()->PostTask(
+  fileapi::FileSystemOperationContext* context_ptr = context.release();
+  return context_ptr->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&NativeMediaFileUtil::CreateDirectoryOnTaskRunnerThread,
-                 weak_factory_.GetWeakPtr(), context, url, exclusive, recursive,
-                 callback));
+                 weak_factory_.GetWeakPtr(), base::Owned(context_ptr),
+                 url, exclusive, recursive, callback));
 }
 
 bool NativeMediaFileUtil::GetFileInfo(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     const GetFileInfoCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return context->task_runner()->PostTask(
+  fileapi::FileSystemOperationContext* context_ptr = context.release();
+  return context_ptr->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&NativeMediaFileUtil::GetFileInfoOnTaskRunnerThread,
-                 weak_factory_.GetWeakPtr(), context, url, callback));
+                 weak_factory_.GetWeakPtr(), base::Owned(context_ptr),
+                 url, callback));
 }
 
 bool NativeMediaFileUtil::ReadDirectory(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     const ReadDirectoryCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return context->task_runner()->PostTask(
+  fileapi::FileSystemOperationContext* context_ptr = context.release();
+  return context_ptr->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread,
-                 weak_factory_.GetWeakPtr(), context, url, callback));
+                 weak_factory_.GetWeakPtr(), base::Owned(context_ptr),
+                 url, callback));
 }
 
 bool NativeMediaFileUtil::Touch(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     const base::Time& last_access_time,
     const base::Time& last_modified_time,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (!callback.is_null())
     callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
   return true;
 }
 
 bool NativeMediaFileUtil::Truncate(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     int64 length,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (!callback.is_null())
     callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
   return true;
 }
 
 bool NativeMediaFileUtil::CopyFileLocal(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& src_url,
     const fileapi::FileSystemURL& dest_url,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return context->task_runner()->PostTask(
+  fileapi::FileSystemOperationContext* context_ptr = context.release();
+  return context_ptr->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&NativeMediaFileUtil::CopyOrMoveFileLocalOnTaskRunnerThread,
-                 weak_factory_.GetWeakPtr(), context, src_url, dest_url,
-                 true /* copy */, callback));
+                 weak_factory_.GetWeakPtr(), base::Owned(context_ptr),
+                 src_url, dest_url, true /* copy */, callback));
 }
 
 bool NativeMediaFileUtil::MoveFileLocal(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& src_url,
     const fileapi::FileSystemURL& dest_url,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return context->task_runner()->PostTask(
+  fileapi::FileSystemOperationContext* context_ptr = context.release();
+  return context_ptr->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&NativeMediaFileUtil::CopyOrMoveFileLocalOnTaskRunnerThread,
-                 weak_factory_.GetWeakPtr(), context, src_url, dest_url,
-                 false /* copy */, callback));
+                 weak_factory_.GetWeakPtr(), base::Owned(context_ptr),
+                 src_url, dest_url, false /* copy */, callback));
 }
 
 bool NativeMediaFileUtil::CopyInForeignFile(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const base::FilePath& src_file_path,
     const fileapi::FileSystemURL& dest_url,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return context->task_runner()->PostTask(
+  fileapi::FileSystemOperationContext* context_ptr = context.release();
+  return context_ptr->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&NativeMediaFileUtil::CopyInForeignFileOnTaskRunnerThread,
-                 weak_factory_.GetWeakPtr(), context, src_file_path, dest_url,
-                 callback));
+                 weak_factory_.GetWeakPtr(), base::Owned(context_ptr),
+                 src_file_path, dest_url, callback));
 }
 
 bool NativeMediaFileUtil::DeleteFile(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (!callback.is_null())
     callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
   return true;
 }
 
 // This is needed to support Copy and Move.
 bool NativeMediaFileUtil::DeleteDirectory(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return context->task_runner()->PostTask(
+  fileapi::FileSystemOperationContext* context_ptr = context.release();
+  return context_ptr->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&NativeMediaFileUtil::DeleteDirectoryOnTaskRunnerThread,
-                 weak_factory_.GetWeakPtr(), context, url, callback));
+                 weak_factory_.GetWeakPtr(), base::Owned(context_ptr),
+                 url, callback));
 }
 
 bool NativeMediaFileUtil::CreateSnapshotFile(
-    fileapi::FileSystemOperationContext* context,
+    scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
     const CreateSnapshotFileCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return context->task_runner()->PostTask(
+  fileapi::FileSystemOperationContext* context_ptr = context.release();
+  return context_ptr->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&NativeMediaFileUtil::CreateSnapshotFileOnTaskRunnerThread,
-                 weak_factory_.GetWeakPtr(), context, url, callback));
+                 weak_factory_.GetWeakPtr(), base::Owned(context_ptr),
+                 url, callback));
 }
 
 void NativeMediaFileUtil::CreateDirectoryOnTaskRunnerThread(
     fileapi::FileSystemOperationContext* context,
     const fileapi::FileSystemURL& url,
     bool exclusive,
     bool recursive,
     const StatusCallback& callback) {
   DCHECK(IsOnTaskRunnerThread(context));
   base::PlatformFileError error =
@@ skipping 168 matching lines @@
     return error;
   return fileapi::NativeFileUtil::CopyOrMoveFile(src_file_path, dest_file_path,
                                                  true);
 }
 
 base::PlatformFileError NativeMediaFileUtil::GetFileInfoSync(
     fileapi::FileSystemOperationContext* context,
     const fileapi::FileSystemURL& url,
     base::PlatformFileInfo* file_info,
     base::FilePath* platform_path) {
+  DCHECK(context);
   DCHECK(IsOnTaskRunnerThread(context));
-  DCHECK(context);
   DCHECK(file_info);
   DCHECK(GetMediaPathFilter(context));
 
   base::FilePath file_path;
-  base::PlatformFileError error = GetLocalFilePath(context, url, &file_path);
+  base::PlatformFileError error = GetLocalFilePath(
+      context, url, &file_path);

[Lei Zhang, 2013/06/10 05:34:54]

nit: this was fine as is before?

[kinuko, 2013/06/10 06:46:31]

Right, reverted.

   if (error != base::PLATFORM_FILE_OK)
     return error;
   if (file_util::IsLink(file_path))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   error = fileapi::NativeFileUtil::GetFileInfo(file_path, file_info);
   if (error != base::PLATFORM_FILE_OK)
     return error;
 
   if (platform_path)
     *platform_path = file_path;
@@ skipping 138 matching lines @@
   if (!file_info.is_directory &&
       !GetMediaPathFilter(context)->Match(file_path)) {
     return failure_error;
   }
 
   *local_file_path = file_path;
   return base::PLATFORM_FILE_OK;
 }
 
 }  // namespace chrome