Commit 07aef0e9 authored by dcheng's avatar dcheng Committed by Commit bot

Remove implicit conversions from scoped_refptr to T* in chrome/browser/media_galleries/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610

Review URL: https://codereview.chromium.org/505283002

Cr-Commit-Position: refs/heads/master@{#291973}
parent a9be894f
...@@ -432,7 +432,7 @@ void DeviceMediaAsyncFileUtil::CreateSnapshotFile( ...@@ -432,7 +432,7 @@ void DeviceMediaAsyncFileUtil::CreateSnapshotFile(
scoped_refptr<base::SequencedTaskRunner> task_runner(context->task_runner()); scoped_refptr<base::SequencedTaskRunner> task_runner(context->task_runner());
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
task_runner, task_runner.get(),
FROM_HERE, FROM_HERE,
base::Bind(&CreateSnapshotFileOnBlockingPool, url.path(), profile_path_), base::Bind(&CreateSnapshotFileOnBlockingPool, url.path(), profile_path_),
base::Bind(&OnSnapshotFileCreatedRunTask, base::Bind(&OnSnapshotFileCreatedRunTask,
......
...@@ -104,10 +104,16 @@ int MTPFileStreamReader::Read(net::IOBuffer* buf, int buf_len, ...@@ -104,10 +104,16 @@ int MTPFileStreamReader::Read(net::IOBuffer* buf, int buf_len,
header_buf_len = net::kMaxBytesToSniff; header_buf_len = net::kMaxBytesToSniff;
} }
ReadBytes(url_, header_buf, 0, header_buf_len, ReadBytes(url_,
header_buf.get(),
0,
header_buf_len,
base::Bind(&MTPFileStreamReader::FinishValidateMediaHeader, base::Bind(&MTPFileStreamReader::FinishValidateMediaHeader,
weak_factory_.GetWeakPtr(), header_buf, weak_factory_.GetWeakPtr(),
make_scoped_refptr(buf), buf_len, callback), header_buf,
make_scoped_refptr(buf),
buf_len,
callback),
callback); callback);
return net::ERR_IO_PENDING; return net::ERR_IO_PENDING;
} }
......
...@@ -38,7 +38,7 @@ int ReadaheadFileStreamReader::Read( ...@@ -38,7 +38,7 @@ int ReadaheadFileStreamReader::Read(
scoped_refptr<net::DrainableIOBuffer> sink = scoped_refptr<net::DrainableIOBuffer> sink =
new net::DrainableIOBuffer(buf, buf_len); 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. // We are waiting for an source read to complete, so save the request.
if (result == net::ERR_IO_PENDING) { if (result == net::ERR_IO_PENDING) {
...@@ -103,13 +103,14 @@ void ReadaheadFileStreamReader::ReadFromSourceIfNeeded() { ...@@ -103,13 +103,14 @@ void ReadaheadFileStreamReader::ReadFromSourceIfNeeded() {
scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(kBufferSize)); scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(kBufferSize));
int result = source_->Read( int result = source_->Read(
buf, buf.get(),
kBufferSize, kBufferSize,
base::Bind(&ReadaheadFileStreamReader::OnFinishReadFromSource, base::Bind(&ReadaheadFileStreamReader::OnFinishReadFromSource,
weak_factory_.GetWeakPtr(), buf)); weak_factory_.GetWeakPtr(),
buf));
if (result != net::ERR_IO_PENDING) if (result != net::ERR_IO_PENDING)
OnFinishReadFromSource(buf, result); OnFinishReadFromSource(buf.get(), result);
} }
void ReadaheadFileStreamReader::OnFinishReadFromSource(net::IOBuffer* buf, void ReadaheadFileStreamReader::OnFinishReadFromSource(net::IOBuffer* buf,
...@@ -141,6 +142,6 @@ void ReadaheadFileStreamReader::OnFinishReadFromSource(net::IOBuffer* buf, ...@@ -141,6 +142,6 @@ void ReadaheadFileStreamReader::OnFinishReadFromSource(net::IOBuffer* buf,
net::CompletionCallback completion_callback = pending_read_callback_; net::CompletionCallback completion_callback = pending_read_callback_;
pending_read_callback_.Reset(); pending_read_callback_.Reset();
completion_callback.Run(FinishReadFromCacheOrStoredError(sink)); completion_callback.Run(FinishReadFromCacheOrStoredError(sink.get()));
} }
} }
...@@ -209,7 +209,7 @@ void MTPDeviceTaskHelper::OnGetFileInfoToReadBytes( ...@@ -209,7 +209,7 @@ void MTPDeviceTaskHelper::OnGetFileInfoToReadBytes(
const MtpFileEntry& file_entry, const MtpFileEntry& file_entry,
bool error) { bool error) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(request.buf); DCHECK(request.buf.get());
DCHECK_GE(request.buf_len, 0); DCHECK_GE(request.buf_len, 0);
DCHECK_GE(request.offset, 0); DCHECK_GE(request.offset, 0);
if (error) { if (error) {
......
...@@ -417,10 +417,10 @@ void MediaFolderFinder::ScanFolder() { ...@@ -417,10 +417,10 @@ void MediaFolderFinder::ScanFolder() {
base::FilePath folder_to_scan = folders_to_scan_.back(); base::FilePath folder_to_scan = folders_to_scan_.back();
folders_to_scan_.pop_back(); folders_to_scan_.pop_back();
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
worker_task_runner_, FROM_HERE, worker_task_runner_.get(),
base::Bind(&Worker::ScanFolder, FROM_HERE,
base::Unretained(worker_), base::Bind(
folder_to_scan), &Worker::ScanFolder, base::Unretained(worker_), folder_to_scan),
base::Bind(&MediaFolderFinder::GotScanResults, base::Bind(&MediaFolderFinder::GotScanResults,
weak_factory_.GetWeakPtr(), weak_factory_.GetWeakPtr(),
folder_to_scan)); folder_to_scan));
......
...@@ -189,8 +189,8 @@ class MediaScanManagerTest : public MediaScanManagerObserver, ...@@ -189,8 +189,8 @@ class MediaScanManagerTest : public MediaScanManagerObserver,
} }
void StartScan() { void StartScan() {
media_scan_manager_->StartScan(profile_.get(), extension_, media_scan_manager_->StartScan(
true /* user_gesture */); profile_.get(), extension_.get(), true /* user_gesture */);
} }
MediaGalleriesPreferences* gallery_prefs() { MediaGalleriesPreferences* gallery_prefs() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment