Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/file_stream_unittest.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/default_server_bound_cert_store.cc ('k') | net/base/network_change_notifier_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/file_stream_unittest.cc
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
index 10427846c37c0931ba04f0835fafca53ea402957..e8c66356a465b530dda89d39c9d5041cd6ce6176 100644
--- a/net/base/file_stream_unittest.cc
+++ b/net/base/file_stream_unittest.cc
@@ -245,7 +245,7 @@ TEST_F(FileStreamTest, AsyncRead) {
std::string data_read;
for (;;) {
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
- rv = stream.Read(buf, buf->size(), callback.callback());
+ rv = stream.Read(buf.get(), buf->size(), callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
EXPECT_LE(0, rv);
@@ -276,7 +276,7 @@ TEST_F(FileStreamTest, AsyncRead_EarlyClose) {
TestCompletionCallback callback;
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
- rv = stream.Read(buf, buf->size(), callback.callback());
+ rv = stream.Read(buf.get(), buf->size(), callback.callback());
stream.CloseSync();
if (rv < 0) {
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -308,7 +308,7 @@ TEST_F(FileStreamTest, AsyncRead_EarlyDelete) {
EXPECT_EQ(file_size, total_bytes_avail);
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
- rv = stream->Read(buf, buf->size(), callback.callback());
+ rv = stream->Read(buf.get(), buf->size(), callback.callback());
stream.reset(); // Delete instead of closing it.
if (rv < 0) {
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -343,7 +343,7 @@ TEST_F(FileStreamTest, AsyncRead_EarlyDelete_NoAutoClose) {
TestCompletionCallback callback;
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
- int rv = stream->Read(buf, buf->size(), callback.callback());
+ int rv = stream->Read(buf.get(), buf->size(), callback.callback());
stream.reset(); // Delete instead of closing it.
if (rv < 0) {
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -425,7 +425,7 @@ TEST_F(FileStreamTest, AsyncRead_FromOffset) {
std::string data_read;
for (;;) {
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
- rv = stream.Read(buf, buf->size(), callback.callback());
+ rv = stream.Read(buf.get(), buf->size(), callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
EXPECT_LE(0, rv);
@@ -534,9 +534,9 @@ TEST_F(FileStreamTest, AsyncWrite) {
scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
scoped_refptr<DrainableIOBuffer> drainable =
- new DrainableIOBuffer(buf, buf->size());
+ new DrainableIOBuffer(buf.get(), buf->size());
while (total_bytes_written != kTestDataSize) {
- rv = stream.Write(drainable, drainable->BytesRemaining(),
+ rv = stream.Write(drainable.get(), drainable->BytesRemaining(),
callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
@@ -567,7 +567,7 @@ TEST_F(FileStreamTest, AsyncWrite_EarlyClose) {
TestCompletionCallback callback;
scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
- rv = stream.Write(buf, buf->size(), callback.callback());
+ rv = stream.Write(buf.get(), buf->size(), callback.callback());
stream.CloseSync();
if (rv < 0) {
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -630,9 +630,9 @@ TEST_F(FileStreamTest, AsyncWrite_FromOffset) {
scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
scoped_refptr<DrainableIOBuffer> drainable =
- new DrainableIOBuffer(buf, buf->size());
+ new DrainableIOBuffer(buf.get(), buf->size());
while (total_bytes_written != kTestDataSize) {
- rv = stream.Write(drainable, drainable->BytesRemaining(),
+ rv = stream.Write(drainable.get(), drainable->BytesRemaining(),
callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
@@ -756,7 +756,7 @@ TEST_F(FileStreamTest, BasicAsyncReadWrite) {
std::string data_read;
for (;;) {
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
- rv = stream.Read(buf, buf->size(), callback.callback());
+ rv = stream.Read(buf.get(), buf->size(), callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
EXPECT_LE(0, rv);
@@ -772,9 +772,9 @@ TEST_F(FileStreamTest, BasicAsyncReadWrite) {
scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
scoped_refptr<DrainableIOBuffer> drainable =
- new DrainableIOBuffer(buf, buf->size());
+ new DrainableIOBuffer(buf.get(), buf->size());
while (total_bytes_written != kTestDataSize) {
- rv = stream.Write(drainable, drainable->BytesRemaining(),
+ rv = stream.Write(drainable.get(), drainable->BytesRemaining(),
callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
@@ -819,9 +819,9 @@ TEST_F(FileStreamTest, BasicAsyncWriteRead) {
scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
scoped_refptr<DrainableIOBuffer> drainable =
- new DrainableIOBuffer(buf, buf->size());
+ new DrainableIOBuffer(buf.get(), buf->size());
while (total_bytes_written != kTestDataSize) {
- rv = stream.Write(drainable, drainable->BytesRemaining(),
+ rv = stream.Write(drainable.get(), drainable->BytesRemaining(),
callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
@@ -844,7 +844,7 @@ TEST_F(FileStreamTest, BasicAsyncWriteRead) {
std::string data_read;
for (;;) {
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
- rv = stream.Read(buf, buf->size(), callback.callback());
+ rv = stream.Read(buf.get(), buf->size(), callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
EXPECT_LE(0, rv);
@@ -882,7 +882,7 @@ class TestWriteReadCompletionCallback {
callback_(base::Bind(&TestWriteReadCompletionCallback::OnComplete,
base::Unretained(this))),
test_data_(CreateTestDataBuffer()),
- drainable_(new DrainableIOBuffer(test_data_, kTestDataSize)) {
+ drainable_(new DrainableIOBuffer(test_data_.get(), kTestDataSize)) {
}
int WaitForResult() {
@@ -911,7 +911,7 @@ class TestWriteReadCompletionCallback {
std::string data_read;
TestWriteReadCompletionCallback callback(
stream_, &total_bytes_written, &total_bytes_read, &data_read);
- rv = stream_->Write(drainable_, drainable_->BytesRemaining(),
+ rv = stream_->Write(drainable_.get(), drainable_->BytesRemaining(),
callback.callback());
DCHECK_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -925,7 +925,7 @@ class TestWriteReadCompletionCallback {
TestCompletionCallback callback;
for (;;) {
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
- rv = stream_->Read(buf, buf->size(), callback.callback());
+ rv = stream_->Read(buf.get(), buf->size(), callback.callback());
if (rv == ERR_IO_PENDING) {
MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
rv = callback.WaitForResult();
@@ -984,7 +984,7 @@ TEST_F(FileStreamTest, AsyncWriteRead) {
&total_bytes_read, &data_read);
scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
- rv = stream.Write(buf, buf->size(), callback.callback());
+ rv = stream.Write(buf.get(), buf->size(), callback.callback());
if (rv == ERR_IO_PENDING)
rv = callback.WaitForResult();
EXPECT_LT(0, rv);
@@ -1013,7 +1013,7 @@ class TestWriteCloseCompletionCallback {
callback_(base::Bind(&TestWriteCloseCompletionCallback::OnComplete,
base::Unretained(this))),
test_data_(CreateTestDataBuffer()),
- drainable_(new DrainableIOBuffer(test_data_, kTestDataSize)) {
+ drainable_(new DrainableIOBuffer(test_data_.get(), kTestDataSize)) {
}
int WaitForResult() {
@@ -1040,7 +1040,7 @@ class TestWriteCloseCompletionCallback {
// Recurse to finish writing all data.
int total_bytes_written = 0;
TestWriteCloseCompletionCallback callback(stream_, &total_bytes_written);
- rv = stream_->Write(drainable_, drainable_->BytesRemaining(),
+ rv = stream_->Write(drainable_.get(), drainable_->BytesRemaining(),
callback.callback());
DCHECK_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -1091,7 +1091,7 @@ TEST_F(FileStreamTest, AsyncWriteClose) {
TestWriteCloseCompletionCallback callback(&stream, &total_bytes_written);
scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
- rv = stream.Write(buf, buf->size(), callback.callback());
+ rv = stream.Write(buf.get(), buf->size(), callback.callback());
if (rv == ERR_IO_PENDING)
total_bytes_written = callback.WaitForResult();
EXPECT_LT(0, total_bytes_written);
@@ -1197,7 +1197,7 @@ TEST_F(FileStreamTest, AsyncWriteAndCloseSync) {
// Write some data asynchronously.
scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
- stream.Write(buf, buf->size(), callback.callback());
+ stream.Write(buf.get(), buf->size(), callback.callback());
// Close the stream without waiting for the completion.
stream.CloseSync();
« no previous file with comments | « net/base/default_server_bound_cert_store.cc ('k') | net/base/network_change_notifier_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698