diff options
Diffstat (limited to 'storage/browser/fileapi')
7 files changed, 30 insertions, 50 deletions
diff --git a/storage/browser/fileapi/async_file_util_adapter.cc b/storage/browser/fileapi/async_file_util_adapter.cc index 361c73a..cf79022 100644 --- a/storage/browser/fileapi/async_file_util_adapter.cc +++ b/storage/browser/fileapi/async_file_util_adapter.cc @@ -218,9 +218,9 @@ void AsyncFileUtilAdapter::ReadDirectory( FileSystemOperationContext* context_ptr = context.release(); const bool success = context_ptr->task_runner()->PostTask( FROM_HERE, - Bind(&ReadDirectoryHelper, - sync_file_util_.get(), base::Owned(context_ptr), url, - base::ThreadTaskRunnerHandle::Get(), callback)); + Bind(&ReadDirectoryHelper, sync_file_util_.get(), + base::Owned(context_ptr), url, + base::RetainedRef(base::ThreadTaskRunnerHandle::Get()), callback)); DCHECK(success); } diff --git a/storage/browser/fileapi/file_system_context.cc b/storage/browser/fileapi/file_system_context.cc index 8631801..166413c 100644 --- a/storage/browser/fileapi/file_system_context.cc +++ b/storage/browser/fileapi/file_system_context.cc @@ -428,15 +428,12 @@ void FileSystemContext::DeleteFileSystem( } base::PostTaskAndReplyWithResult( - default_file_task_runner(), - FROM_HERE, + default_file_task_runner(), FROM_HERE, // It is safe to pass Unretained(quota_util) since context owns it. base::Bind(&FileSystemQuotaUtil::DeleteOriginDataOnFileTaskRunner, base::Unretained(backend->GetQuotaUtil()), - make_scoped_refptr(this), - base::Unretained(quota_manager_proxy()), - origin_url, - type), + base::RetainedRef(this), + base::Unretained(quota_manager_proxy()), origin_url, type), callback); } diff --git a/storage/browser/fileapi/file_system_file_stream_reader.cc b/storage/browser/fileapi/file_system_file_stream_reader.cc index 0f30eb3..1b749be 100644 --- a/storage/browser/fileapi/file_system_file_stream_reader.cc +++ b/storage/browser/fileapi/file_system_file_stream_reader.cc @@ -69,10 +69,9 @@ int FileSystemFileStreamReader::Read( const net::CompletionCallback& callback) { if (local_file_reader_) return local_file_reader_->Read(buf, buf_len, callback); - return CreateSnapshot( - base::Bind(&ReadAdapter, weak_factory_.GetWeakPtr(), - make_scoped_refptr(buf), buf_len, callback), - callback); + return CreateSnapshot(base::Bind(&ReadAdapter, weak_factory_.GetWeakPtr(), + base::RetainedRef(buf), buf_len, callback), + callback); } int64_t FileSystemFileStreamReader::GetLength( diff --git a/storage/browser/fileapi/file_system_quota_client.cc b/storage/browser/fileapi/file_system_quota_client.cc index f6cab0d..58a219d 100644 --- a/storage/browser/fileapi/file_system_quota_client.cc +++ b/storage/browser/fileapi/file_system_quota_client.cc @@ -114,14 +114,11 @@ void FileSystemQuotaClient::GetOriginUsage( } base::PostTaskAndReplyWithResult( - file_task_runner(), - FROM_HERE, + file_task_runner(), FROM_HERE, // It is safe to pass Unretained(quota_util) since context owns it. base::Bind(&FileSystemQuotaUtil::GetOriginUsageOnFileTaskRunner, base::Unretained(quota_util), - file_system_context_, - origin_url, - type), + base::RetainedRef(file_system_context_), origin_url, type), callback); } @@ -139,14 +136,10 @@ void FileSystemQuotaClient::GetOriginsForType( std::set<GURL>* origins_ptr = new std::set<GURL>(); file_task_runner()->PostTaskAndReply( - FROM_HERE, - base::Bind(&GetOriginsForTypeOnFileTaskRunner, - file_system_context_, - storage_type, - base::Unretained(origins_ptr)), - base::Bind(&DidGetOrigins, - callback, - base::Owned(origins_ptr))); + FROM_HERE, base::Bind(&GetOriginsForTypeOnFileTaskRunner, + base::RetainedRef(file_system_context_), + storage_type, base::Unretained(origins_ptr)), + base::Bind(&DidGetOrigins, callback, base::Owned(origins_ptr))); } void FileSystemQuotaClient::GetOriginsForHost( @@ -164,15 +157,10 @@ void FileSystemQuotaClient::GetOriginsForHost( std::set<GURL>* origins_ptr = new std::set<GURL>(); file_task_runner()->PostTaskAndReply( - FROM_HERE, - base::Bind(&GetOriginsForHostOnFileTaskRunner, - file_system_context_, - storage_type, - host, - base::Unretained(origins_ptr)), - base::Bind(&DidGetOrigins, - callback, - base::Owned(origins_ptr))); + FROM_HERE, base::Bind(&GetOriginsForHostOnFileTaskRunner, + base::RetainedRef(file_system_context_), + storage_type, host, base::Unretained(origins_ptr)), + base::Bind(&DidGetOrigins, callback, base::Owned(origins_ptr))); } void FileSystemQuotaClient::DeleteOriginData( @@ -183,12 +171,9 @@ void FileSystemQuotaClient::DeleteOriginData( DCHECK(fs_type != kFileSystemTypeUnknown); base::PostTaskAndReplyWithResult( - file_task_runner(), - FROM_HERE, + file_task_runner(), FROM_HERE, base::Bind(&DeleteOriginOnFileTaskRunner, - file_system_context_, - origin, - fs_type), + base::RetainedRef(file_system_context_), origin, fs_type), callback); } diff --git a/storage/browser/fileapi/local_file_stream_reader.cc b/storage/browser/fileapi/local_file_stream_reader.cc index c6bfbbd..74a9cc9 100644 --- a/storage/browser/fileapi/local_file_stream_reader.cc +++ b/storage/browser/fileapi/local_file_stream_reader.cc @@ -43,8 +43,8 @@ int LocalFileStreamReader::Read(net::IOBuffer* buf, int buf_len, if (stream_impl_) return stream_impl_->Read(buf, buf_len, callback); return Open(base::Bind(&LocalFileStreamReader::DidOpenForRead, - weak_factory_.GetWeakPtr(), - make_scoped_refptr(buf), buf_len, callback)); + weak_factory_.GetWeakPtr(), base::RetainedRef(buf), + buf_len, callback)); } int64_t LocalFileStreamReader::GetLength( diff --git a/storage/browser/fileapi/local_file_stream_writer.cc b/storage/browser/fileapi/local_file_stream_writer.cc index e586fd1..03ca22b 100644 --- a/storage/browser/fileapi/local_file_stream_writer.cc +++ b/storage/browser/fileapi/local_file_stream_writer.cc @@ -55,10 +55,10 @@ int LocalFileStreamWriter::Write(net::IOBuffer* buf, int buf_len, has_pending_operation_ = false; return result; } - return InitiateOpen(callback, - base::Bind(&LocalFileStreamWriter::ReadyToWrite, - weak_factory_.GetWeakPtr(), - make_scoped_refptr(buf), buf_len, callback)); + return InitiateOpen( + callback, base::Bind(&LocalFileStreamWriter::ReadyToWrite, + weak_factory_.GetWeakPtr(), base::RetainedRef(buf), + buf_len, callback)); } int LocalFileStreamWriter::Cancel(const net::CompletionCallback& callback) { diff --git a/storage/browser/fileapi/sandbox_file_stream_writer.cc b/storage/browser/fileapi/sandbox_file_stream_writer.cc index 363fb01..3cca3d3 100644 --- a/storage/browser/fileapi/sandbox_file_stream_writer.cc +++ b/storage/browser/fileapi/sandbox_file_stream_writer.cc @@ -70,10 +70,9 @@ int SandboxFileStreamWriter::Write( if (local_file_writer_) return WriteInternal(buf, buf_len, callback); - net::CompletionCallback write_task = - base::Bind(&SandboxFileStreamWriter::DidInitializeForWrite, - weak_factory_.GetWeakPtr(), - make_scoped_refptr(buf), buf_len, callback); + net::CompletionCallback write_task = base::Bind( + &SandboxFileStreamWriter::DidInitializeForWrite, + weak_factory_.GetWeakPtr(), base::RetainedRef(buf), buf_len, callback); file_system_context_->operation_runner()->CreateSnapshotFile( url_, base::Bind(&SandboxFileStreamWriter::DidCreateSnapshotFile, weak_factory_.GetWeakPtr(), write_task)); |