Remove CloseFile from FileSystem.

chrome/browser/chromeos/drive/webkit_file_stream_writer_impl.cc

 // Copyright 2013 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/chromeos/drive/webkit_file_stream_writer_impl.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/fileapi_worker.h"
@@ skipping 19 matching lines @@
 
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(
           &fileapi_internal::RunFileSystemCallback,
           file_system_getter,
           base::Bind(&fileapi_internal::CreateWritableSnapshotFile,
                      drive_path, google_apis::CreateRelayCallback(callback)),
           google_apis::CreateRelayCallback(base::Bind(
-              callback, base::PLATFORM_FILE_ERROR_FAILED, base::FilePath()))));
-}
-
-// Closes the writable snapshot file opened by CreateWritableSnapshotFile.
-// TODO(hidehiko): Get rid of this function. crbug.com/259184.
-void CloseFile(
-    const WebkitFileStreamWriterImpl::FileSystemGetter& file_system_getter,
-    const base::FilePath& drive_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  BrowserThread::PostTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&fileapi_internal::RunFileSystemCallback,
-                 file_system_getter,
-                 base::Bind(&fileapi_internal::CloseFile, drive_path),
-                 base::Closure()));
+              callback, base::PLATFORM_FILE_ERROR_FAILED, base::FilePath(),
+              base::Closure()))));
 }
 
 }  // namespace
 
 WebkitFileStreamWriterImpl::WebkitFileStreamWriterImpl(
     const FileSystemGetter& file_system_getter,
     base::TaskRunner* file_task_runner,
     const base::FilePath& file_path,
     int64 offset)
     : file_system_getter_(file_system_getter),
       file_task_runner_(file_task_runner),
       file_path_(file_path),
       offset_(offset),
       weak_ptr_factory_(this) {
 }
 
 WebkitFileStreamWriterImpl::~WebkitFileStreamWriterImpl() {
   if (local_file_writer_) {
     // If the file is opened, close it at destructor.
     // It is necessary to close the local file in advance.
     local_file_writer_.reset();

[hashimoto, 2013/07/23 11:24:58]

nit: How about DCHECK(on_close_file_callback_on_ui_thread_)?

[hidehiko, 2013/07/23 14:32:24]

Done.

-    CloseFile(file_system_getter_, file_path_);
+    BrowserThread::PostTask(BrowserThread::UI,
+                            FROM_HERE,
+                            on_close_file_callback_on_ui_thread_);
   }
 }
 
 int WebkitFileStreamWriterImpl::Write(net::IOBuffer* buf,
                                       int buf_len,
                                       const net::CompletionCallback& callback) {
   DCHECK(pending_write_callback_.is_null());
   DCHECK(pending_cancel_callback_.is_null());
   DCHECK(!callback.is_null());
 
@@ skipping 50 matching lines @@
   // Here is the case Flush() is called before any Write() invocation.
   // Do nothing.
   // Synchronization to the remote server is not done until the file is closed.
   return net::OK;
 }
 
 void WebkitFileStreamWriterImpl::WriteAfterCreateWritableSnapshotFile(
     net::IOBuffer* buf,
     int buf_len,
     base::PlatformFileError open_result,
-    const base::FilePath& local_path) {
+    const base::FilePath& local_path,
+    const base::Closure& on_close_file_callback_on_ui_thread) {
   DCHECK(!local_file_writer_);
 
   if (!pending_cancel_callback_.is_null()) {
     DCHECK(pending_write_callback_.is_null());
     // Cancel() is called during the creation of the snapshot file.
     // Don't write to the file.
     if (open_result == base::PLATFORM_FILE_OK) {
       // Here the file is internally created. To revert the operation, close
       // the file.
-      DCHECK(!local_path.empty());
-      CloseFile(file_system_getter_, file_path_);
+      DCHECK(!on_close_file_callback_on_ui_thread.is_null());
+      BrowserThread::PostTask(BrowserThread::UI,
+                              FROM_HERE,
+                              on_close_file_callback_on_ui_thread);
     }
 
     base::ResetAndReturn(&pending_cancel_callback_).Run(net::OK);
     return;
   }
 
   DCHECK(!pending_write_callback_.is_null());
 
   const net::CompletionCallback callback =
       base::ResetAndReturn(&pending_write_callback_);
   if (open_result != base::PLATFORM_FILE_OK) {
+    DCHECK(on_close_file_callback_on_ui_thread.is_null());
     callback.Run(net::PlatformFileErrorToNetError(open_result));
     return;
   }
 
+  // Keep |on_close_callback| to close the file when the stream is destructed.
+  DCHECK(!on_close_file_callback_on_ui_thread.is_null());
+  on_close_file_callback_on_ui_thread_ = on_close_file_callback_on_ui_thread;
   local_file_writer_.reset(new fileapi::LocalFileStreamWriter(
       file_task_runner_.get(), local_path, offset_));
   int result = local_file_writer_->Write(buf, buf_len, callback);
   if (result != net::ERR_IO_PENDING)
     callback.Run(result);
 }
 
 }  // namespace internal
 }  // namespace drive