base::Bind: Convert FileUtilProxy::EnsureFileExistsCallback.

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 145 matching lines @@
  private:
   base::PlatformFile file_handle_;
 };
 
 class RelayEnsureFileExists : public MessageLoopRelay {
  public:
   RelayEnsureFileExists(
       const fileapi::FileSystemOperationContext& context,
       scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
       const FilePath& file_path,
-      fileapi::FileSystemFileUtilProxy::EnsureFileExistsCallback* callback)
+      const fileapi::FileSystemFileUtilProxy::EnsureFileExistsCallback callback)
       : MessageLoopRelay(context),
         message_loop_proxy_(message_loop_proxy),
         file_path_(file_path),
         callback_(callback),
         created_(false) {
-    DCHECK(callback);
+    DCHECK_EQ(false, callback.is_null());
   }
 
  protected:
   virtual void RunWork() {
     set_error_code(file_util()->EnsureFileExists(
         context(), file_path_, &created_));
   }
 
   virtual void RunCallback() {
-    callback_->Run(error_code(), created_);
-    delete callback_;
+    callback_.Run(error_code(), created_);
   }
 
  private:
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   FilePath file_path_;
-  fileapi::FileSystemFileUtilProxy::EnsureFileExistsCallback* callback_;
+  fileapi::FileSystemFileUtilProxy::EnsureFileExistsCallback callback_;
   bool created_;
 };
 
 
 class RelayGetLocalPath : public MessageLoopRelay {
  public:
   RelayGetLocalPath(
       const fileapi::FileSystemOperationContext& context,
       const FilePath& virtual_path,
       fileapi::FileSystemFileUtilProxy::GetLocalPathCallback* callback)
@@ skipping 244 matching lines @@
     StatusCallback* callback) {
   return Start(FROM_HERE, message_loop_proxy,
                new RelayClose(context, file_handle, callback));
 }
 
 // static
 bool FileSystemFileUtilProxy::EnsureFileExists(
     const FileSystemOperationContext& context,
     scoped_refptr<MessageLoopProxy> message_loop_proxy,
     const FilePath& file_path,
-    EnsureFileExistsCallback* callback) {
+    const EnsureFileExistsCallback& callback) {
   return Start(FROM_HERE, message_loop_proxy, new RelayEnsureFileExists(
       context, message_loop_proxy, file_path, callback));
 }
 
 // static
 bool FileSystemFileUtilProxy::GetLocalPath(
     const FileSystemOperationContext& context,
     scoped_refptr<MessageLoopProxy> message_loop_proxy,
     const FilePath& virtual_path,
     GetLocalPathCallback* callback) {
@@ skipping 86 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