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

Unified Diff: chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc

Issue 505283002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/media_galleries/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
Index: chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc
diff --git a/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc b/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc
index 2aaa2edb94e48b4a54700810514e47e49951177d..d91f39d720fa69f4684a0f5924b18eaf4d992354 100644
--- a/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc
+++ b/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc
@@ -38,7 +38,7 @@ int ReadaheadFileStreamReader::Read(
scoped_refptr<net::DrainableIOBuffer> sink =
new net::DrainableIOBuffer(buf, buf_len);
- int result = FinishReadFromCacheOrStoredError(sink);
+ int result = FinishReadFromCacheOrStoredError(sink.get());
// We are waiting for an source read to complete, so save the request.
if (result == net::ERR_IO_PENDING) {
@@ -103,13 +103,14 @@ void ReadaheadFileStreamReader::ReadFromSourceIfNeeded() {
scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(kBufferSize));
int result = source_->Read(
- buf,
+ buf.get(),
kBufferSize,
base::Bind(&ReadaheadFileStreamReader::OnFinishReadFromSource,
- weak_factory_.GetWeakPtr(), buf));
+ weak_factory_.GetWeakPtr(),
+ buf));
if (result != net::ERR_IO_PENDING)
- OnFinishReadFromSource(buf, result);
+ OnFinishReadFromSource(buf.get(), result);
}
void ReadaheadFileStreamReader::OnFinishReadFromSource(net::IOBuffer* buf,
@@ -141,6 +142,6 @@ void ReadaheadFileStreamReader::OnFinishReadFromSource(net::IOBuffer* buf,
net::CompletionCallback completion_callback = pending_read_callback_;
pending_read_callback_.Reset();
- completion_callback.Run(FinishReadFromCacheOrStoredError(sink));
+ completion_callback.Run(FinishReadFromCacheOrStoredError(sink.get()));
}
}

Powered by Google App Engine
This is Rietveld 408576698