diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 08:51:38 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 08:51:38 +0000 |
| commit | 5eb431e2dfe9d55eaff2acc7a3ea64f403dec669 (patch) | |
| tree | 2dedc5eed71c34a111444dc341642a35ae3eb248 /content | |
| parent | d48a64ebbf54a6d87d82c3787e12f35439e1f62b (diff) | |
| download | chromium_src-5eb431e2dfe9d55eaff2acc7a3ea64f403dec669.zip chromium_src-5eb431e2dfe9d55eaff2acc7a3ea64f403dec669.tar.gz chromium_src-5eb431e2dfe9d55eaff2acc7a3ea64f403dec669.tar.bz2 | |
Switch FileStream to use new CompletionCallback.
BUG=98719
TEST=none
Review URL: http://codereview.chromium.org/8139019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
3 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/download/base_file.cc b/content/browser/download/base_file.cc index f2c2672..07c18f8 100644 --- a/content/browser/download/base_file.cc +++ b/content/browser/download/base_file.cc @@ -251,7 +251,8 @@ net::Error BaseFile::AppendDataToFile(const char* data, size_t data_len) { const char* current_data = data; while (len > 0) { write_count++; - int write_result = file_stream_->Write(current_data, len, NULL); + int write_result = + file_stream_->Write(current_data, len, net::CompletionCallback()); DCHECK_NE(0, write_result); // Check for errors. diff --git a/content/browser/renderer_host/redirect_to_file_resource_handler.cc b/content/browser/renderer_host/redirect_to_file_resource_handler.cc index 64d4fcf..19079a3 100644 --- a/content/browser/renderer_host/redirect_to_file_resource_handler.cc +++ b/content/browser/renderer_host/redirect_to_file_resource_handler.cc @@ -4,6 +4,7 @@ #include "content/browser/renderer_host/redirect_to_file_resource_handler.h" +#include "base/bind.h" #include "base/file_util.h" #include "base/file_util_proxy.h" #include "base/logging.h" @@ -34,8 +35,6 @@ RedirectToFileResourceHandler::RedirectToFileResourceHandler( buf_(new net::GrowableIOBuffer()), buf_write_pending_(false), write_cursor_(0), - write_callback_(ALLOW_THIS_IN_INITIALIZER_LIST(this), - &RedirectToFileResourceHandler::DidWriteToFile), write_callback_pending_(false), request_was_closed_(false), completed_during_write_(false) { @@ -222,9 +221,11 @@ bool RedirectToFileResourceHandler::WriteMore() { if (write_callback_pending_) return true; DCHECK(write_cursor_ < buf_->offset()); - int rv = file_stream_->Write(buf_->StartOfBuffer() + write_cursor_, - buf_->offset() - write_cursor_, - &write_callback_); + int rv = file_stream_->Write( + buf_->StartOfBuffer() + write_cursor_, + buf_->offset() - write_cursor_, + base::Bind(&RedirectToFileResourceHandler::DidWriteToFile, + base::Unretained(this))); if (rv == net::ERR_IO_PENDING) { write_callback_pending_ = true; return true; diff --git a/content/browser/renderer_host/redirect_to_file_resource_handler.h b/content/browser/renderer_host/redirect_to_file_resource_handler.h index 638ea50..c860b2d 100644 --- a/content/browser/renderer_host/redirect_to_file_resource_handler.h +++ b/content/browser/renderer_host/redirect_to_file_resource_handler.h @@ -11,7 +11,6 @@ #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "content/browser/renderer_host/resource_handler.h" -#include "net/base/completion_callback.h" #include "net/url_request/url_request_status.h" class RefCountedPlatformFile; @@ -77,7 +76,6 @@ class RedirectToFileResourceHandler : public ResourceHandler { int write_cursor_; scoped_ptr<net::FileStream> file_stream_; - net::OldCompletionCallbackImpl<RedirectToFileResourceHandler> write_callback_; bool write_callback_pending_; // We create a DeletableFileReference for the temp file created as |