base::Bind: Convert FileUtilProxy::ReadDirectoryCallback.

webkit/fileapi/file_system_file_util_proxy.cc

 // 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.
 
 #include "webkit/fileapi/file_system_file_util_proxy.h"
 
 #include "base/message_loop_proxy.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
@@ skipping 235 matching lines @@
   FilePath file_path_;
   base::PlatformFileInfo file_info_;
   FilePath platform_path_;
 };
 
 class RelayReadDirectory : public MessageLoopRelay {
  public:
   RelayReadDirectory(
       const fileapi::FileSystemOperationContext& context,
       const FilePath& file_path,
-      fileapi::FileSystemFileUtilProxy::ReadDirectoryCallback* callback)
+      const fileapi::FileSystemFileUtilProxy::ReadDirectoryCallback& callback)
       : MessageLoopRelay(context),
         callback_(callback), file_path_(file_path) {
-    DCHECK(callback);
+    DCHECK_EQ(false, callback.is_null());
   }
 
  protected:
   virtual void RunWork() {
     // TODO(kkanetkar): Implement directory read in multiple chunks.
     set_error_code(file_util()->ReadDirectory(
         context(), file_path_, &entries_));
   }
 
   virtual void RunCallback() {
-    callback_->Run(error_code(), entries_);
-    delete callback_;
+    callback_.Run(error_code(), entries_);
   }
 
  private:
-  fileapi::FileSystemFileUtilProxy::ReadDirectoryCallback* callback_;
+  fileapi::FileSystemFileUtilProxy::ReadDirectoryCallback callback_;
   FilePath file_path_;
   std::vector<base::FileUtilProxy::Entry> entries_;
 };
 
 class RelayCreateDirectory : public RelayWithStatusCallback {
  public:
   RelayCreateDirectory(
       const fileapi::FileSystemOperationContext& context,
       const FilePath& file_path,
       bool exclusive,
@@ skipping 186 matching lines @@
     const GetFileInfoCallback& callback) {
   return Start(FROM_HERE, message_loop_proxy, new RelayGetFileInfo(context,
                file_path, callback));
 }
 
 // static
 bool FileSystemFileUtilProxy::ReadDirectory(
     const FileSystemOperationContext& context,
     scoped_refptr<MessageLoopProxy> message_loop_proxy,
     const FilePath& file_path,
-    ReadDirectoryCallback* callback) {
+    const ReadDirectoryCallback& callback) {
   return Start(FROM_HERE, message_loop_proxy, new RelayReadDirectory(context,
                file_path, callback));
 }
 
 // static
 bool FileSystemFileUtilProxy::CreateDirectory(
     const FileSystemOperationContext& context,
     scoped_refptr<MessageLoopProxy> message_loop_proxy,
     const FilePath& file_path,
     bool exclusive,
@@ skipping 56 matching lines @@
     const FileSystemOperationContext& context,
     scoped_refptr<MessageLoopProxy> message_loop_proxy,
     const FilePath& path,
     int64 length,
     StatusCallback* callback) {
   return Start(FROM_HERE, message_loop_proxy,
                new RelayTruncate(context, path, length, callback));
 }
 
 }  // namespace fileapi