From a6e689d570dee7ad9a4fc6cd5cb07ad0a645631a Mon Sep 17 00:00:00 2001 From: "jhawkins@chromium.org" Date: Mon, 17 Oct 2011 20:34:19 +0000 Subject: base::Bind: Convert FileUtilProxy::ReadDirectoryCallback. BUG=none TEST=none R=csilv@chromium.org Review URL: http://codereview.chromium.org/8322009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105903 0039d316-1c4b-4281-b951-d872f2087c98 --- base/file_util_proxy.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'base/file_util_proxy.cc') diff --git a/base/file_util_proxy.cc b/base/file_util_proxy.cc index 3a51b60..771a5be 100644 --- a/base/file_util_proxy.cc +++ b/base/file_util_proxy.cc @@ -421,10 +421,12 @@ class RelayCreateDirectory : public RelayWithStatusCallback { class RelayReadDirectory : public MessageLoopRelay { public: - RelayReadDirectory(const FilePath& file_path, - base::FileUtilProxy::ReadDirectoryCallback* callback) - : callback_(callback), file_path_(file_path) { - DCHECK(callback); + RelayReadDirectory( + const FilePath& file_path, + const base::FileUtilProxy::ReadDirectoryCallback& callback) + : callback_(callback), + file_path_(file_path) { + DCHECK_EQ(false, callback.is_null()); } protected: @@ -456,12 +458,11 @@ class RelayReadDirectory : public MessageLoopRelay { } virtual void RunCallback() { - callback_->Run(error_code(), entries_); - delete callback_; + callback_.Run(error_code(), entries_); } private: - base::FileUtilProxy::ReadDirectoryCallback* callback_; + base::FileUtilProxy::ReadDirectoryCallback callback_; FilePath file_path_; std::vector entries_; }; @@ -790,7 +791,7 @@ bool FileUtilProxy::GetFileInfoFromPlatformFile( bool FileUtilProxy::ReadDirectory( scoped_refptr message_loop_proxy, const FilePath& file_path, - ReadDirectoryCallback* callback) { + const ReadDirectoryCallback& callback) { return Start(FROM_HERE, message_loop_proxy, new RelayReadDirectory( file_path, callback)); } -- cgit v1.1