Remaining cleanup (base::Bind): Replacing FileUtilProxy calls with new callback

webkit/fileapi/file_system_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 WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_PROXY_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_PROXY_H_
 
 #include <vector>
 
-#include "base/callback.h"
+#include "base/callback_old.h"
 #include "base/file_path.h"
 #include "base/file_util_proxy.h"
 #include "base/memory/ref_counted.h"
 #include "base/platform_file.h"
 #include "base/tracked_objects.h"
 
 namespace base {
 class MessageLoopProxy;
 class Time;
 }
 
 namespace fileapi {
 
 class FileSystemOperationContext;
 
 using base::MessageLoopProxy;
 using base::PlatformFile;
 using base::PlatformFileError;
 using base::PlatformFileInfo;
 
 // This class provides asynchronous access to common file routines for the
 // FileSystem API.
 class FileSystemFileUtilProxy {
  public:
-  typedef base::FileUtilProxy::StatusCallback StatusCallback;
-  typedef base::FileUtilProxy::CreateOrOpenCallback CreateOrOpenCallback;
-  typedef base::FileUtilProxy::EnsureFileExistsCallback
-    EnsureFileExistsCallback;
+  typedef base::FileUtilProxy::Entry Entry;
+
+  // TODO(kinuko): replace them with new callback code.
+  typedef Callback1<PlatformFileError>::Type StatusCallback;
+  typedef Callback3<PlatformFileError /* error code */,
+                    base::PassPlatformFile,
+                    bool /* created */>::Type CreateOrOpenCallback;
+  typedef Callback2<PlatformFileError /* error code */,
+                    bool /* created */>::Type EnsureFileExistsCallback;
   typedef Callback3<PlatformFileError /* error code */,
                     const PlatformFileInfo& /* file_info */,
                     const FilePath& /* platform_path, where possible */
                     >::Type GetFileInfoCallback;
   typedef Callback2<PlatformFileError /* error code */,
                     const FilePath& /* local_path, where possible */
                     >::Type GetLocalPathCallback;
-  typedef base::FileUtilProxy::ReadDirectoryCallback ReadDirectoryCallback;
+  typedef Callback2<PlatformFileError /* error code */,
+                    const std::vector<Entry>&>::Type ReadDirectoryCallback;
 
   // 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.
   static bool CreateOrOpen(const FileSystemOperationContext& context,
                            scoped_refptr<MessageLoopProxy> message_loop_proxy,
                            const FilePath& file_path,
                            int file_flags,
@@ skipping 100 matching lines @@
       int64 length,
       StatusCallback* callback);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileSystemFileUtilProxy);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_PROXY_H_