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

webkit/fileapi/local_file_system_operation.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 "webkit/fileapi/local_file_system_operation.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 10 matching lines @@
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/file_writer_delegate.h"
 #include "webkit/fileapi/remove_operation_delegate.h"
 #include "webkit/fileapi/sandbox_file_stream_writer.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/quota_types.h"
 
+using webkit_blob::ScopedFile;
 using webkit_blob::ShareableFileReference;
 
 namespace fileapi {
 
 LocalFileSystemOperation::LocalFileSystemOperation(
     FileSystemContext* file_system_context,
     scoped_ptr<FileSystemOperationContext> operation_context)
     : file_system_context_(file_system_context),
       operation_context_(operation_context.Pass()),
       async_file_util_(NULL),
@@ skipping 779 matching lines @@
   if (rv == base::PLATFORM_FILE_OK)
     CHECK_NE(base::kNullProcessHandle, peer_handle_);
   callback.Run(rv, file.ReleaseValue(), peer_handle_);
 }
 
 void LocalFileSystemOperation::DidCreateSnapshotFile(
     const SnapshotFileCallback& callback,
     base::PlatformFileError result,
     const base::PlatformFileInfo& file_info,
     const base::FilePath& platform_path,
-    SnapshotFilePolicy snapshot_policy) {
-  scoped_refptr<ShareableFileReference> file_ref;
-  if (result == base::PLATFORM_FILE_OK &&
-      snapshot_policy == kSnapshotFileTemporary) {
-    file_ref = ShareableFileReference::GetOrCreate(
-        platform_path, ShareableFileReference::DELETE_ON_FINAL_RELEASE,
-        file_system_context()->task_runners()->file_task_runner());
-  }
+    const scoped_refptr<ShareableFileReference>& file_ref) {
   callback.Run(result, file_info, platform_path, file_ref);
 }
 
 base::PlatformFileError LocalFileSystemOperation::SetUp(
     const FileSystemURL& url,
     OperationMode mode) {
   DCHECK(url.is_valid());
 
   async_file_util_ = file_system_context()->GetAsyncFileUtil(url.type());
   if (!async_file_util_)
@@ skipping 21 matching lines @@
 }
 
 bool LocalFileSystemOperation::SetPendingOperationType(OperationType type) {
   if (pending_operation_ != kOperationNone)
     return false;
   pending_operation_ = type;
   return true;
 }
 
 }  // namespace fileapi