Base: Introduce a new version of FileUtilProxy that works with File.

base/files/file_proxy.h

Index: base/files/file_proxy.h
diff --git a/base/files/file_util_proxy.h b/base/files/file_proxy.h
similarity index 26%
copy from base/files/file_util_proxy.h
copy to base/files/file_proxy.h
index 846e8fb87800ec846a5c6e9b7f831d5e48a9bfc5..b011c735cc0d45e8ee95e890d020be9ccca0f32d 100644
--- a/base/files/file_util_proxy.h
+++ b/base/files/file_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_FILES_FILE_UTIL_PROXY_H_
-#define BASE_FILES_FILE_UTIL_PROXY_H_
+#ifndef BASE_FILES_FILE_PROXY_H_
+#define BASE_FILES_FILE_PROXY_H_
 
 #include "base/base_export.h"
 #include "base/callback_forward.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "base/platform_file.h"
+#include "base/memory/weak_ptr.h"
 
 namespace tracked_objects {
 class Location;
@@ -21,176 +21,109 @@ namespace base {
 class TaskRunner;
 class Time;
 
-// This class provides asynchronous access to common file routines.
-class BASE_EXPORT FileUtilProxy {
+// This class provides asynchronous access to a File. All methods follow the
+// same rules of the equivalent File method, as they are implemented by bouncing
+// the operation to File using a TaskRunner.
+class BASE_EXPORT FileProxy : public SupportsWeakPtr<FileProxy> {
  public:
-  // This callback is used by methods that report only an error code.  It is
-  // valid to pass a null callback to any function that takes a StatusCallback,
-  // in which case the operation will complete silently.
+  // This callback is used by methods that report only an error code. It is
+  // valid to pass a null callback to some functions that takes a
+  // StatusCallback, in which case the operation will complete silently.
   typedef Callback<void(File::Error)> StatusCallback;
 
   typedef Callback<void(File::Error,
-                        PassPlatformFile,
-                        bool /* created */)> CreateOrOpenCallback;
-  typedef Callback<void(File::Error,
-                        PassPlatformFile,
                         const FilePath&)> CreateTemporaryCallback;
   typedef Callback<void(File::Error,
                         const File::Info&)> GetFileInfoCallback;
   typedef Callback<void(File::Error,
-                        const char* /* data */,
-                        int /* bytes read */)> ReadCallback;
+                        const char* data,
+                        int bytes_read)> ReadCallback;
   typedef Callback<void(File::Error,
-                        int /* bytes written */)> WriteCallback;
+                        int bytes_written)> WriteCallback;
+
+  FileProxy();
+  explicit FileProxy(TaskRunner* task_runner);
+  ~FileProxy();
 
-  typedef Callback<File::Error(PlatformFile*, bool*)> CreateOrOpenTask;
-  typedef Callback<File::Error(PlatformFile)> CloseTask;
-  typedef Callback<File::Error(void)> FileTask;
+  // Sets the |task_runner| to be used for all operations, in case it was not
+  // set at construction time.
+  void set_task_runner(TaskRunner* task_runner) {

[kinuko, 2014/03/03 05:58:58]

Why do we want to have this separate method?

[rvargas (doing something else), 2014/03/03 20:38:34]

Maybe we don't :). I'm assuming that someone will have a FileProxy member
variable without knowing at construction time what thread to use.

Happy to remove it if you want me to.

[kinuko, 2014/03/04 04:07:45]

If we don't have the case yet I think not having this is simpler/cleaner. (I'm
totally happy with having/re-adding it if necessary)

[rvargas (doing something else), 2014/03/04 23:53:53]

Done.

+    task_runner_ = task_runner;
+  }
 
   // Creates or opens a file with the given flags. It is invalid to pass a null
-  // callback. If PLATFORM_FILE_CREATE is set in |file_flags| it always tries to
-  // create a new file at the given |file_path| and calls back with
-  // PLATFORM_FILE_ERROR_FILE_EXISTS if the |file_path| already exists.
+  // callback. If File::FLAG_CREATE is set in |file_flags| it always tries to
+  // create a new file at the given |file_path| and fails if the file already
+  // exists.
   //
   // This returns false if task posting to |task_runner| has failed.
-  static bool CreateOrOpen(TaskRunner* task_runner,
-                           const FilePath& file_path,
-                           int file_flags,
-                           const CreateOrOpenCallback& callback);
+  bool CreateOrOpen(const FilePath& file_path,
+                    uint32 file_flags,
+                    const StatusCallback& callback);
 
-  // Creates a temporary file for writing. The path and an open file handle are
+  // Creates a temporary file for writing. The path and an open file are
   // returned. It is invalid to pass a null callback. The additional file flags
   // will be added on top of the default file flags which are:
-  //   base::PLATFORM_FILE_CREATE_ALWAYS
-  //   base::PLATFORM_FILE_WRITE
-  //   base::PLATFORM_FILE_TEMPORARY.
-  // Set |additional_file_flags| to 0 for synchronous writes and set to
-  // base::PLATFORM_FILE_ASYNC to support asynchronous file operations.
+  //   File::FLAG_CREATE_ALWAYS
+  //   File::FLAG_WRITE
+  //   File::FLAG_TEMPORARY.
   //
   // This returns false if task posting to |task_runner| has failed.
-  static bool CreateTemporary(
-      TaskRunner* task_runner,
-      int additional_file_flags,
-      const CreateTemporaryCallback& callback);
+  bool CreateTemporary(uint32 additional_file_flags,
+                       const CreateTemporaryCallback& callback);
 
-  // Close the given file handle.
-  // This returns false if task posting to |task_runner| has failed.
-  static bool Close(TaskRunner* task_runner,
-                    PlatformFile,
-                    const StatusCallback& callback);
+  bool IsValid() const;

[kinuko, 2014/03/03 05:58:58]

This'd also need a comment (as proxy's validity == file's validity may not be
obvious to everyone)

[rvargas (doing something else), 2014/03/03 20:38:34]

Done.

 
-  // Retrieves the information about a file. It is invalid to pass a null
-  // callback.
-  // This returns false if task posting to |task_runner| has failed.
-  static bool GetFileInfo(
-      TaskRunner* task_runner,
-      const FilePath& file_path,
-      const GetFileInfoCallback& callback);
+  // Returns true if a new file was created (or an old one truncated to zero
+  // length to simulate a new file), and false otherwise.
+  bool created() const { return file_.created(); }
 
-  // Does the same as GetFileInfo but takes PlatformFile instead of FilePath.
+  File TakeFile();
+
+  // Proxies File::Close. The callback can be null.
   // This returns false if task posting to |task_runner| has failed.
-  static bool GetFileInfoFromPlatformFile(
-      TaskRunner* task_runner,
-      PlatformFile file,
-      const GetFileInfoCallback& callback);
+  bool Close(const StatusCallback& callback);
 
-  // Deletes a file or a directory.
-  // It is an error to delete a non-empty directory with recursive=false.
+  // Proxies File::GetInfo. The callback can't be null.
   // This returns false if task posting to |task_runner| has failed.
-  static bool DeleteFile(TaskRunner* task_runner,
-                         const FilePath& file_path,
-                         bool recursive,
-                         const StatusCallback& callback);
+  bool GetInfo(const GetFileInfoCallback& callback);
 
-  // Reads from a file. On success, the file pointer is moved to position
-  // |offset + bytes_to_read| in the file. The callback can be null.
-  //
+  // Proxies File::Read. The callback can't be null.
   // This returns false if |bytes_to_read| is less than zero, or
   // if task posting to |task_runner| has failed.
-  static bool Read(
-      TaskRunner* task_runner,
-      PlatformFile file,
-      int64 offset,
-      int bytes_to_read,
-      const ReadCallback& callback);
-
-  // Writes to a file. If |offset| is greater than the length of the file,
-  // |false| is returned. On success, the file pointer is moved to position
-  // |offset + bytes_to_write| in the file. The callback can be null.
-  // |bytes_to_write| must be greater than zero.
-  //
+  bool Read(int64 offset, int bytes_to_read, const ReadCallback& callback);
+
+  // Proxies File::Write. The callback can be null.
   // This returns false if |bytes_to_write| is less than or equal to zero,
   // if |buffer| is NULL, or if task posting to |task_runner| has failed.
-  static bool Write(
-      TaskRunner* task_runner,
-      PlatformFile file,
-      int64 offset,
-      const char* buffer,
-      int bytes_to_write,
-      const WriteCallback& callback);
-
-  // Touches a file. The callback can be null.
-  // This returns false if task posting to |task_runner| has failed.
-  static bool Touch(
-      TaskRunner* task_runner,
-      PlatformFile file,
-      const Time& last_access_time,
-      const Time& last_modified_time,
-      const StatusCallback& callback);
-
-  // Touches a file. The callback can be null.
-  // This returns false if task posting to |task_runner| has failed.
-  static bool Touch(
-      TaskRunner* task_runner,
-      const FilePath& file_path,
-      const Time& last_access_time,
-      const Time& last_modified_time,
-      const StatusCallback& callback);
-
-  // Truncates a file to the given length. If |length| is greater than the
-  // current length of the file, the file will be extended with zeroes.
-  // The callback can be null.
+  bool Write(int64 offset,
+             const char* buffer,
+             int bytes_to_write,
+             const WriteCallback& callback);
+
+  // Proxies File::SetTimes. The callback can be null.
   // This returns false if task posting to |task_runner| has failed.
-  static bool Truncate(
-      TaskRunner* task_runner,
-      PlatformFile file,
-      int64 length,
-      const StatusCallback& callback);
-
-  // Truncates a file to the given length. If |length| is greater than the
-  // current length of the file, the file will be extended with zeroes.
-  // The callback can be null.
+  bool SetTimes(Time last_access_time,
+                Time last_modified_time,
+                const StatusCallback& callback);
+
+  // Proxies File::SetLength. The callback can be null.
   // This returns false if task posting to |task_runner| has failed.
-  static bool Truncate(
-      TaskRunner* task_runner,
-      const FilePath& path,
-      int64 length,
-      const StatusCallback& callback);
+  bool SetLength(int64 length, const StatusCallback& callback);
 
-  // Flushes a file. The callback can be null.
+  // Proxies File::Flush. The callback can be null.
   // This returns false if task posting to |task_runner| has failed.
-  static bool Flush(
-      TaskRunner* task_runner,
-      PlatformFile file,
-      const StatusCallback& callback);
-
-  // Relay helpers.
-  // They return false if posting a given task to |task_runner| has failed.
-  static bool RelayCreateOrOpen(
-      TaskRunner* task_runner,
-      const CreateOrOpenTask& open_task,
-      const CloseTask& close_task,
-      const CreateOrOpenCallback& callback);
-  static bool RelayClose(
-      TaskRunner* task_runner,
-      const CloseTask& close_task,
-      PlatformFile,
-      const StatusCallback& callback);
+  bool Flush(const StatusCallback& callback);
 
  private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(FileUtilProxy);
+  friend class FileHelper;
+  void SetFile(File file);
+
+  scoped_refptr<TaskRunner> task_runner_;
+  File file_;
+  DISALLOW_COPY_AND_ASSIGN(FileProxy);
 };
 
 }  // namespace base
 
-#endif  // BASE_FILES_FILE_UTIL_PROXY_H_
+#endif  // BASE_FILES_FILE_PROXY_H_