Remove CloseFile from FileSystem.

chrome/browser/chromeos/drive/file_system.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/chromeos/drive/file_system.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_system/close_file_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/copy_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.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/move_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/open_file_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/search_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/touch_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/truncate_operation.h"
@@ skipping 68 matching lines @@
       &FileSystem::ReloadAfterReset,
       weak_ptr_factory_.GetWeakPtr()));
 }
 
 void FileSystem::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   SetupChangeListLoader();
 
   file_system::OperationObserver* observer = this;
-  close_file_operation_.reset(
-      new file_system::CloseFileOperation(blocking_task_runner_.get(),
-                                          observer,
-                                          resource_metadata_,
-                                          &open_files_));
   copy_operation_.reset(
       new file_system::CopyOperation(blocking_task_runner_.get(),
                                      observer,
                                      scheduler_,
                                      resource_metadata_,
                                      cache_,
                                      drive_service_,
                                      temporary_file_directory_));
   create_directory_operation_.reset(new file_system::CreateDirectoryOperation(
       blocking_task_runner_.get(), observer, scheduler_, resource_metadata_));
   create_file_operation_.reset(
       new file_system::CreateFileOperation(blocking_task_runner_.get(),
                                            observer,
                                            scheduler_,
                                            resource_metadata_,
                                            cache_));
   move_operation_.reset(
       new file_system::MoveOperation(observer, scheduler_, resource_metadata_));
   open_file_operation_.reset(
       new file_system::OpenFileOperation(blocking_task_runner_.get(),
                                          observer,
                                          scheduler_,
                                          resource_metadata_,
                                          cache_,
-                                         temporary_file_directory_,
-                                         &open_files_));
+                                         temporary_file_directory_));
   remove_operation_.reset(
       new file_system::RemoveOperation(blocking_task_runner_.get(),
                                        observer,
                                        scheduler_,
                                        resource_metadata_,
                                        cache_));
   touch_operation_.reset(new file_system::TouchOperation(
       blocking_task_runner_.get(), observer, scheduler_, resource_metadata_));
   truncate_operation_.reset(
       new file_system::TruncateOperation(blocking_task_runner_.get(),
@@ skipping 599 matching lines @@
   // Metadata related to delta update.
   metadata.last_update_check_time = last_update_check_time_;
   metadata.last_update_check_error = last_update_check_error_;
 
   resource_metadata_->GetLargestChangestampOnUIThread(
       base::Bind(&OnGetLargestChangestamp, metadata, callback));
 }
 
 void FileSystem::MarkCacheFileAsMounted(
     const base::FilePath& drive_file_path,
-    const OpenFileCallback& callback) {
+    const MarkMountedCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   GetResourceEntryByPath(
       drive_file_path,
       base::Bind(&FileSystem::MarkCacheFileAsMountedAfterGetResourceEntry,
                  weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void FileSystem::MarkCacheFileAsMountedAfterGetResourceEntry(
-    const OpenFileCallback& callback,
+    const MarkMountedCallback& callback,
     FileError error,
     scoped_ptr<ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != FILE_ERROR_OK) {
     callback.Run(error, base::FilePath());
     return;
   }
 
@@ skipping 59 matching lines @@
 
 void FileSystem::OpenFile(const base::FilePath& file_path,
                           OpenMode open_mode,
                           const OpenFileCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   open_file_operation_->OpenFile(file_path, open_mode, callback);
 }
 
-void FileSystem::CloseFile(const base::FilePath& file_path,
-                           const FileOperationCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!callback.is_null());
-
-  close_file_operation_->CloseFile(file_path, callback);
-}
-
 void FileSystem::CheckLocalModificationAndRun(
     scoped_ptr<ResourceEntry> entry,
     const GetResourceEntryCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(entry.get());
   DCHECK(!callback.is_null());
 
   // For entries that will never be cached, use the original resource entry
   // as is.
   if (!entry->has_file_specific_info() ||
@@ skipping 84 matching lines @@
     return;
   }
 
   PlatformFileInfoProto entry_file_info;
   util::ConvertPlatformFileInfoToResourceEntry(*file_info, &entry_file_info);
   *entry->mutable_file_info() = entry_file_info;
   callback.Run(FILE_ERROR_OK, entry.Pass());
 }
 
 }  // namespace drive