base::Bind: Convert FileUtilProxy::ReadCallback.

base/file_util_proxy.h

 // Copyright (c) 2011 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 BASE_FILE_UTIL_PROXY_H_
 #define BASE_FILE_UTIL_PROXY_H_
 
 #include <vector>
 
 #include "base/base_export.h"
@@ skipping 15 matching lines @@
  public:
   // Holds metadata for file or directory entry. Used by ReadDirectoryCallback.
   struct Entry {
     FilePath::StringType name;
     bool is_directory;
     int64 size;
     base::Time last_modified_time;
   };
 
   // This callback is used by methods that report only an error code.  It is
   // valid to pass NULL as the callback parameter to any function that takes a

[csilv, 2011/10/17 20:22:28]

"valid to pass a null callback"

[James Hawkins, 2011/10/17 20:44:38]

This is fixed in the StatusCallback CL.

   // StatusCallback, in which case the operation will complete silently.
   // The ownership of |callback| is taken by the function and will always be
   // deleted by the function even on failure.
   typedef Callback1<PlatformFileError /* error code */>::Type StatusCallback;
 
   typedef base::Callback<void(PlatformFileError /* error code */,
                               PassPlatformFile,
                               bool /* created */)> CreateOrOpenCallback;
   typedef base::Callback<void(PlatformFileError /* error code */,
                               PassPlatformFile,
                               FilePath)> CreateTemporaryCallback;
   typedef base::Callback<void(PlatformFileError /* error code */,
                               bool /* created */)> EnsureFileExistsCallback;
   typedef base::Callback<void(PlatformFileError /* error code */,
                               const PlatformFileInfo& /* file_info */)>
       GetFileInfoCallback;
   typedef base::Callback<void(PlatformFileError /* error code */,
                               const std::vector<Entry>&)> ReadDirectoryCallback;
-  typedef Callback3<PlatformFileError /* error code */,
-                    const char* /* data */,
-                    int /* bytes read/written */>::Type ReadCallback;
+  typedef base::Callback<void(PlatformFileError /* error code */,
+                              const char* /* data */,
+                              int /* bytes read/written */)> ReadCallback;
   typedef Callback2<PlatformFileError /* error code */,
                     int /* bytes written */>::Type WriteCallback;
 
   // Creates or opens a file with the given flags.  It is invalid to pass NULL

[csilv, 2011/10/17 20:22:28]

NULL -> null

[James Hawkins, 2011/10/17 20:44:38]

Done.

   // for the 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.
   // Takes ownership of |callback| and will delete it even on failure.
   static bool CreateOrOpen(scoped_refptr<MessageLoopProxy> message_loop_proxy,
                            const FilePath& file_path,
                            int file_flags,
                            const CreateOrOpenCallback& callback);
 
   // Creates a temporary file for writing.  The path and an open file handle
   // are returned.  It is invalid to pass NULL for the callback.  The additional

[csilv, 2011/10/17 20:22:28]

NULL -> null

[James Hawkins, 2011/10/17 20:44:38]

Done.

   // 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.
   static bool CreateTemporary(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       int additional_file_flags,
       const CreateTemporaryCallback& callback);
@@ skipping 10 matching lines @@
   // is set PLATFORM_FILE_OK.
   // If the file already exists, |created| is set false and |error code|
   // is set PLATFORM_FILE_OK.
   // If the file hasn't existed but it couldn't be created for some other
   // reasons, |created| is set false and |error code| indicates the error.
   static bool EnsureFileExists(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       const FilePath& file_path,
       const EnsureFileExistsCallback& callback);
 
   // Retrieves the information about a file. It is invalid to pass NULL for the

[csilv, 2011/10/17 20:22:28]

NULL -> null

[James Hawkins, 2011/10/17 20:44:38]

Done.

   // callback.
   static bool GetFileInfo(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       const FilePath& file_path,
       const GetFileInfoCallback& callback);
 
   static bool GetFileInfoFromPlatformFile(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       PlatformFile file,
       const GetFileInfoCallback& callback);
@@ skipping 39 matching lines @@
                      bool recursive,
                      StatusCallback* callback);
 
   // Deletes a directory and all of its contents.
   static bool RecursiveDelete(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       const FilePath& file_path,
       StatusCallback* 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.
+  // |offset + bytes_to_read| in the file. The callback can be null.
   static bool Read(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       PlatformFile file,
       int64 offset,
       int bytes_to_read,
-      ReadCallback* callback);
+      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.
   static bool Write(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       PlatformFile file,
       int64 offset,
       const char* buffer,
@@ skipping 40 matching lines @@
       PlatformFile file,
       StatusCallback* callback);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileUtilProxy);
 };
 
 }  // namespace base
 
 #endif  // BASE_FILE_UTIL_PROXY_H_