diff options
author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 23:40:27 +0000 |
---|---|---|
committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 23:40:27 +0000 |
commit | c12519fb92c4e6ae39b20376badc19c825d62d2c (patch) | |
tree | 659e1f599702c63ef54dcf4c262ea1995fc01b20 /net/tools | |
parent | 0b9803cdd8e63251ad6485608dc7c00d439c0729 (diff) | |
download | chromium_src-c12519fb92c4e6ae39b20376badc19c825d62d2c.zip chromium_src-c12519fb92c4e6ae39b20376badc19c825d62d2c.tar.gz chromium_src-c12519fb92c4e6ae39b20376badc19c825d62d2c.tar.bz2 |
Revert cl 9528 to fix mac test_shell_tests
Review URL: http://codereview.chromium.org/21236
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r-- | net/tools/dump_cache/upgrade.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/tools/dump_cache/upgrade.cc b/net/tools/dump_cache/upgrade.cc index 6b4a2da..d048c6f 100644 --- a/net/tools/dump_cache/upgrade.cc +++ b/net/tools/dump_cache/upgrade.cc @@ -5,7 +5,6 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "net/base/io_buffer.h" #include "net/disk_cache/backend_impl.h" #include "net/disk_cache/entry_impl.h" @@ -445,10 +444,8 @@ void MasterSM::DoReadData(int bytes_read) { return SendReadData(); } - scoped_refptr<net::WrappedIOBuffer> buf = - new net::WrappedIOBuffer(input_->buffer); - if (read_size != entry_->WriteData(stream_, offset_, buf, read_size, NULL, - false)) + if (read_size != entry_->WriteData(stream_, offset_, input_->buffer, + read_size, NULL, false)) return Fail(); offset_ += read_size; @@ -716,9 +713,8 @@ void SlaveSM::DoReadData() { stream < 0 || stream > 1 || size > kBufferSize) { msg.result = RESULT_INVALID_PARAMETER; } else { - scoped_refptr<net::WrappedIOBuffer> buf = - new net::WrappedIOBuffer(output_->buffer); - int ret = entry_->ReadData(stream, input_->msg.arg3, buf, size, NULL); + int ret = entry_->ReadData(stream, input_->msg.arg3, output_->buffer, size, + NULL); msg.buffer_bytes = (ret < 0) ? 0 : ret; msg.result = RESULT_OK; |