Change some snapshot- or temporary-file related changes to use ScopedFile

webkit/fileapi/media/device_media_async_file_util.cc

Index: webkit/fileapi/media/device_media_async_file_util.cc
diff --git a/webkit/fileapi/media/device_media_async_file_util.cc b/webkit/fileapi/media/device_media_async_file_util.cc
index 2340a19fd5c164f1bb5c9773618b20a8772db609..b9ec2895d54c4c9859f50b644d27c8463e334e1d 100644
--- a/webkit/fileapi/media/device_media_async_file_util.cc
+++ b/webkit/fileapi/media/device_media_async_file_util.cc
@@ -7,6 +7,7 @@
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/single_thread_task_runner.h"
+#include "webkit/blob/shareable_file_reference.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
@@ -18,6 +19,8 @@
 #include "webkit/fileapi/media/mtp_device_async_delegate.h"
 #include "webkit/fileapi/media/mtp_device_map_service.h"
 
+using webkit_blob::ShareableFileReference;
+
 namespace fileapi {
 
 namespace {
@@ -306,11 +309,16 @@ void DeviceMediaAsyncFileUtil::OnReadDirectoryError(
 
 void DeviceMediaAsyncFileUtil::OnDidCreateSnapshotFile(
     const AsyncFileUtil::CreateSnapshotFileCallback& callback,
+    base::SequencedTaskRunner* media_task_runner,
     const base::PlatformFileInfo& file_info,
     const base::FilePath& platform_path) {
-  if (!callback.is_null())
-    callback.Run(base::PLATFORM_FILE_OK, file_info, platform_path,
-                 kSnapshotFileTemporary);
+  if (callback.is_null())
+    return;
+  callback.Run(base::PLATFORM_FILE_OK, file_info, platform_path,
+               ShareableFileReference::GetOrCreate(
+                   platform_path,
+                   ShareableFileReference::DELETE_ON_FINAL_RELEASE,
+                   media_task_runner));
 }
 
 void DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError(
@@ -318,7 +326,7 @@ void DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError(
     base::PlatformFileError error) {
   if (!callback.is_null())
     callback.Run(error, base::PlatformFileInfo(), base::FilePath(),
-                 kSnapshotFileTemporary);
+                 scoped_refptr<ShareableFileReference>());
 }
 
 void DeviceMediaAsyncFileUtil::OnSnapshotFileCreatedRunTask(
@@ -341,7 +349,8 @@ void DeviceMediaAsyncFileUtil::OnSnapshotFileCreatedRunTask(
       *snapshot_file_path,
       base::Bind(&DeviceMediaAsyncFileUtil::OnDidCreateSnapshotFile,
                  weak_ptr_factory_.GetWeakPtr(),
-                 callback),
+                 callback,
+                 make_scoped_refptr(context->task_runner())),
       base::Bind(&DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));