Remove CloseFile from FileSystem.

chrome/browser/chromeos/drive/file_system/open_file_operation.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/file_system/open_file_operation.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/download_operation.h"
+#include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace file_system {
 namespace {
 
 FileError UpdateFileLocalState(internal::FileCache* cache,
                                const std::string& resource_id,
                                const std::string& md5,
                                base::FilePath* local_file_path) {
   FileError error = cache->MarkDirty(resource_id, md5);
   if (error != FILE_ERROR_OK)
     return error;
 
   return cache->GetFile(resource_id, md5, local_file_path);
 }
 
 }  // namespace
 
 OpenFileOperation::OpenFileOperation(
     base::SequencedTaskRunner* blocking_task_runner,
     OperationObserver* observer,
     JobScheduler* scheduler,
     internal::ResourceMetadata* metadata,
     internal::FileCache* cache,
-    const base::FilePath& temporary_file_directory,
-    std::map<base::FilePath, int>* open_files)
+    const base::FilePath& temporary_file_directory)
     : blocking_task_runner_(blocking_task_runner),
+      observer_(observer),
       cache_(cache),
       create_file_operation_(new CreateFileOperation(
           blocking_task_runner, observer, scheduler, metadata, cache)),
       download_operation_(new DownloadOperation(
           blocking_task_runner, observer, scheduler,
           metadata, cache, temporary_file_directory)),
-      open_files_(open_files),
       weak_ptr_factory_(this) {
-  DCHECK(open_files);
 }
 
 OpenFileOperation::~OpenFileOperation() {
 }
 
 void OpenFileOperation::OpenFile(const base::FilePath& file_path,
                                  OpenMode open_mode,
                                  const OpenFileCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
@@ skipping 23 matching lines @@
 }
 
 void OpenFileOperation::OpenFileAfterCreateFile(
     const base::FilePath& file_path,
     const OpenFileCallback& callback,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != FILE_ERROR_OK) {
-    callback.Run(error, base::FilePath());
+    callback.Run(error, base::FilePath(), base::Closure());
     return;
   }
 
   download_operation_->EnsureFileDownloadedByPath(
       file_path,
       ClientContext(USER_INITIATED),
       GetFileContentInitializedCallback(),
       google_apis::GetContentCallback(),
       base::Bind(
           &OpenFileOperation::OpenFileAfterFileDownloaded,
-          weak_ptr_factory_.GetWeakPtr(), file_path, callback));
+          weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void OpenFileOperation::OpenFileAfterFileDownloaded(
-    const base::FilePath& file_path,
     const OpenFileCallback& callback,
     FileError error,
     const base::FilePath& local_file_path,
     scoped_ptr<ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error == FILE_ERROR_OK) {
     DCHECK(entry);
     DCHECK(entry->has_file_specific_info());
     if (entry->file_specific_info().is_hosted_document())
       // No support for opening a hosted document.
       error = FILE_ERROR_INVALID_OPERATION;
   }
 
   if (error != FILE_ERROR_OK) {
-    callback.Run(error, base::FilePath());
+    callback.Run(error, base::FilePath(), base::Closure());
     return;
   }
 
   // Note: after marking the file dirty, the local file path may be changed.
   // So, it is necessary to take the path again.
   base::FilePath* new_local_file_path = new base::FilePath;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&UpdateFileLocalState,
                  cache_,
                  entry->resource_id(),
                  entry->file_specific_info().md5(),
                  new_local_file_path),
       base::Bind(&OpenFileOperation::OpenFileAfterUpdateLocalState,
                  weak_ptr_factory_.GetWeakPtr(),
-                 file_path,
+                 entry->resource_id(),
                  callback,
                  base::Owned(new_local_file_path)));
 }
 
 void OpenFileOperation::OpenFileAfterUpdateLocalState(
-    const base::FilePath& file_path,
+    const std::string& resource_id,
     const OpenFileCallback& callback,
     const base::FilePath* local_file_path,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  if (error == FILE_ERROR_OK)
-    ++(*open_files_)[file_path];
-  callback.Run(error, *local_file_path);
+  if (error != FILE_ERROR_OK) {
+    callback.Run(error, base::FilePath(), base::Closure());
+    return;
+  }
+
+  ++open_files_[resource_id];
+  callback.Run(error, *local_file_path,
+               base::Bind(&OpenFileOperation::CloseFile,
+                          weak_ptr_factory_.GetWeakPtr(), resource_id));
+}
+
+void OpenFileOperation::CloseFile(const std::string& resource_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_GT(open_files_[resource_id], 0);
+
+  if (--open_files_[resource_id] == 0) {
+    // All clients closes this file, so notify to upload the file.
+    open_files_.erase(resource_id);
+    observer_->OnCacheFileUploadNeededByOperation(resource_id);
+  }
 }
 
 }  // namespace file_system
 }  // namespace drive