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 34 matching lines @@
   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
   // 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,
@@ skipping 86 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.

[csilv, 2011/10/17 19:46:16]

Technically the callback can't be NULL.... so mybe we want to re-word the
comment?  Or maybe the general gist of the comment is still accurate.

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

Changed it to read "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_