Remove CloseFile from FileSystem.

chrome/browser/chromeos/drive/file_system.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 25 matching lines @@
 class FileSystemObserver;
 class JobScheduler;
 
 namespace internal {
 class ChangeListLoader;
 class ResourceMetadata;
 class SyncClient;
 }  // namespace internal
 
 namespace file_system {
-class CloseFileOperation;
 class CopyOperation;
 class CreateDirectoryOperation;
 class CreateFileOperation;
 class DownloadOperation;
 class MoveOperation;
 class OpenFileOperation;
 class OperationObserver;
 class RemoveOperation;
 class SearchOperation;
 class TouchOperation;
@@ skipping 31 matching lines @@
       const base::FilePath& remote_src_file_path,
       const base::FilePath& local_dest_file_path,
       const FileOperationCallback& callback) OVERRIDE;
   virtual void TransferFileFromLocalToRemote(
       const base::FilePath& local_src_file_path,
       const base::FilePath& remote_dest_file_path,
       const FileOperationCallback& callback) OVERRIDE;
   virtual void OpenFile(const base::FilePath& file_path,
                         OpenMode open_mode,
                         const OpenFileCallback& callback) OVERRIDE;
-  virtual void CloseFile(const base::FilePath& file_path,
-                         const FileOperationCallback& callback) OVERRIDE;
   virtual void Copy(const base::FilePath& src_file_path,
                     const base::FilePath& dest_file_path,
                     const FileOperationCallback& callback) OVERRIDE;
   virtual void Move(const base::FilePath& src_file_path,
                     const base::FilePath& dest_file_path,
                     const FileOperationCallback& callback) OVERRIDE;
   virtual void Remove(const base::FilePath& file_path,
                       bool is_recursive,
                       const FileOperationCallback& callback) OVERRIDE;
   virtual void CreateDirectory(const base::FilePath& directory_path,
@@ skipping 26 matching lines @@
       const GetResourceEntryCallback& callback) OVERRIDE;
   virtual void ReadDirectoryByPath(
       const base::FilePath& directory_path,
       const ReadDirectoryCallback& callback) OVERRIDE;
   virtual void GetAvailableSpace(
       const GetAvailableSpaceCallback& callback) OVERRIDE;
   virtual void GetMetadata(
       const GetFilesystemMetadataCallback& callback) OVERRIDE;
   virtual void MarkCacheFileAsMounted(
       const base::FilePath& drive_file_path,
-      const OpenFileCallback& callback) OVERRIDE;
+      const MarkMountedCallback& callback) OVERRIDE;
   virtual void MarkCacheFileAsUnmounted(
       const base::FilePath& cache_file_path,
       const FileOperationCallback& callback) OVERRIDE;
   virtual void GetCacheEntryByResourceId(
       const std::string& resource_id,
       const std::string& md5,
       const GetCacheEntryCallback& callback) OVERRIDE;
   virtual void Reload() OVERRIDE;
 
   // file_system::OperationObserver overrides.
@@ skipping 127 matching lines @@
       const base::FilePath& local_cache_path);
   void CheckLocalModificationAndRunAfterGetFileInfo(
       scoped_ptr<ResourceEntry> entry,
       const GetResourceEntryCallback& callback,
       base::PlatformFileInfo* file_info,
       bool get_file_info_result);
 
   // Part of MarkCacheFileAsMounted. Called after GetResourceEntryByPath is
   // completed. |callback| must not be null.
   void MarkCacheFileAsMountedAfterGetResourceEntry(
-      const OpenFileCallback& callback,
+      const MarkMountedCallback& callback,
       FileError error,
       scoped_ptr<ResourceEntry> entry);
 
   // Used to get Drive related preferences.
   PrefService* pref_service_;
 
   // Sub components owned by DriveIntegrationService.
   internal::FileCache* cache_;
   DriveServiceInterface* drive_service_;
   JobScheduler* scheduler_;
   internal::ResourceMetadata* resource_metadata_;
 
   // Time of the last update check.
   base::Time last_update_check_time_;
 
   // Error of the last update check.
   FileError last_update_check_error_;
 
   // True if hosted documents should be hidden.
   bool hide_hosted_docs_;
 
-  // Map from opened file paths to the number how many the file is opened.
-  // The value should be incremented by OpenFile, and decremented by CloseFile.
-  std::map<base::FilePath, int> open_files_;
-
   scoped_ptr<PrefChangeRegistrar> pref_registrar_;
 
   scoped_ptr<internal::SyncClient> sync_client_;
 
   // The loader is used to load the change lists.
   scoped_ptr<internal::ChangeListLoader> change_list_loader_;
 
   ObserverList<FileSystemObserver> observers_;
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
   base::FilePath temporary_file_directory_;
 
   // Implementation of each file system operation.
-  scoped_ptr<file_system::CloseFileOperation> close_file_operation_;
   scoped_ptr<file_system::CopyOperation> copy_operation_;
   scoped_ptr<file_system::CreateDirectoryOperation> create_directory_operation_;
   scoped_ptr<file_system::CreateFileOperation> create_file_operation_;
   scoped_ptr<file_system::MoveOperation> move_operation_;
   scoped_ptr<file_system::OpenFileOperation> open_file_operation_;
   scoped_ptr<file_system::RemoveOperation> remove_operation_;
   scoped_ptr<file_system::TouchOperation> touch_operation_;
   scoped_ptr<file_system::TruncateOperation> truncate_operation_;
   scoped_ptr<file_system::DownloadOperation> download_operation_;
   scoped_ptr<file_system::UpdateOperation> update_operation_;
   scoped_ptr<file_system::SearchOperation> search_operation_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<FileSystem> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystem);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_