diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-24 02:39:54 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-24 02:39:54 +0000 |
| commit | e993abfe81feaa374d476828a44942d296bdcc78 (patch) | |
| tree | 201fffef0ba93ce41afaf2bd6e61e05b61c04028 /net/http/http_transaction_unittest.h | |
| parent | 0afe80d755b899c188313629ea3f45f0fe5be981 (diff) | |
| download | chromium_src-e993abfe81feaa374d476828a44942d296bdcc78.zip chromium_src-e993abfe81feaa374d476828a44942d296bdcc78.tar.gz chromium_src-e993abfe81feaa374d476828a44942d296bdcc78.tar.bz2 | |
revert r8603
Review URL: http://codereview.chromium.org/18576
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_transaction_unittest.h')
| -rw-r--r-- | net/http/http_transaction_unittest.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h index 0c26178..ccdb954 100644 --- a/net/http/http_transaction_unittest.h +++ b/net/http/http_transaction_unittest.h @@ -149,7 +149,7 @@ class TestTransactionConsumer : public CallbackRunner< Tuple1<int> > { if (result <= 0) { DidFinish(result); } else { - content_.append(read_buf_->data(), result); + content_.append(read_buf_, result); Read(); } } @@ -163,8 +163,7 @@ class TestTransactionConsumer : public CallbackRunner< Tuple1<int> > { void Read() { state_ = READING; - read_buf_ = new net::IOBuffer(1024); - int result = trans_->Read(read_buf_, 1024, this); + int result = trans_->Read(read_buf_, sizeof(read_buf_), this); if (result != net::ERR_IO_PENDING) DidRead(result); } @@ -178,7 +177,7 @@ class TestTransactionConsumer : public CallbackRunner< Tuple1<int> > { scoped_ptr<net::HttpTransaction> trans_; std::string content_; - scoped_refptr<net::IOBuffer> read_buf_; + char read_buf_[1024]; int error_; static int quit_counter_; @@ -238,12 +237,11 @@ class MockNetworkTransaction : public net::HttpTransaction { return net::ERR_FAILED; } - virtual int Read(net::IOBuffer* buf, int buf_len, - net::CompletionCallback* callback) { + virtual int Read(char* buf, int buf_len, net::CompletionCallback* callback) { int data_len = static_cast<int>(data_.size()); int num = std::min(buf_len, data_len - data_cursor_); if (num) { - memcpy(buf->data(), data_.data() + data_cursor_, num); + memcpy(buf, data_.data() + data_cursor_, num); data_cursor_ += num; } if (test_mode_ & TEST_MODE_SYNC_NET_READ) |