summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-08-26 17:00:27 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-27 00:03:07 +0000
commit87267fed0d81366585191b2b9ad591f0cdc87d52 (patch)
treeef11ba62c7e9aa395a47aacd354c6dbc1622eb6f /webkit
parent61b78e43a64f95913e16f13a9a171881902d30d3 (diff)
downloadchromium_src-87267fed0d81366585191b2b9ad591f0cdc87d52.zip
chromium_src-87267fed0d81366585191b2b9ad591f0cdc87d52.tar.gz
chromium_src-87267fed0d81366585191b2b9ad591f0cdc87d52.tar.bz2
Remove implicit conversions from scoped_refptr to T* in webkit/
This patch was generated by running the rewrite_scoped_refptr clang tool on a Linux build. BUG=110610 Review URL: https://codereview.chromium.org/488463005 Cr-Commit-Position: refs/heads/master@{#292041}
Diffstat (limited to 'webkit')
-rw-r--r--webkit/browser/blob/blob_data_handle.cc4
-rw-r--r--webkit/browser/blob/blob_url_request_job_factory.cc4
-rw-r--r--webkit/browser/fileapi/quota/quota_backend_impl.cc11
-rw-r--r--webkit/browser/fileapi/sandbox_file_system_backend_delegate.cc2
4 files changed, 12 insertions, 9 deletions
diff --git a/webkit/browser/blob/blob_data_handle.cc b/webkit/browser/blob/blob_data_handle.cc
index a205dd5..667228a 100644
--- a/webkit/browser/blob/blob_data_handle.cc
+++ b/webkit/browser/blob/blob_data_handle.cc
@@ -23,7 +23,7 @@ BlobDataHandle::BlobDataHandleShared::BlobDataHandleShared(
}
BlobData* BlobDataHandle::BlobDataHandleShared::data() const {
- return blob_data_;
+ return blob_data_.get();
}
const std::string& BlobDataHandle::BlobDataHandleShared::uuid() const {
@@ -40,7 +40,7 @@ BlobDataHandle::BlobDataHandle(BlobData* blob_data,
base::SequencedTaskRunner* task_runner)
: io_task_runner_(task_runner),
shared_(new BlobDataHandleShared(blob_data, context, task_runner)) {
- DCHECK(io_task_runner_);
+ DCHECK(io_task_runner_.get());
DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
}
diff --git a/webkit/browser/blob/blob_url_request_job_factory.cc b/webkit/browser/blob/blob_url_request_job_factory.cc
index c8e4fd3..a4521ae 100644
--- a/webkit/browser/blob/blob_url_request_job_factory.cc
+++ b/webkit/browser/blob/blob_url_request_job_factory.cc
@@ -64,8 +64,8 @@ net::URLRequestJob* BlobProtocolHandler::MaybeCreateJob(
return new storage::BlobURLRequestJob(request,
network_delegate,
LookupBlobData(request),
- file_system_context_,
- file_loop_proxy_);
+ file_system_context_.get(),
+ file_loop_proxy_.get());
}
scoped_refptr<storage::BlobData> BlobProtocolHandler::LookupBlobData(
diff --git a/webkit/browser/fileapi/quota/quota_backend_impl.cc b/webkit/browser/fileapi/quota/quota_backend_impl.cc
index fe2e11d..deb100e 100644
--- a/webkit/browser/fileapi/quota/quota_backend_impl.cc
+++ b/webkit/browser/fileapi/quota/quota_backend_impl.cc
@@ -43,12 +43,15 @@ void QuotaBackendImpl::ReserveQuota(const GURL& origin,
callback.Run(base::File::FILE_OK, 0);
return;
}
- DCHECK(quota_manager_proxy_);
+ DCHECK(quota_manager_proxy_.get());
quota_manager_proxy_->GetUsageAndQuota(
- file_task_runner_, origin, FileSystemTypeToQuotaStorageType(type),
+ file_task_runner_.get(),
+ origin,
+ FileSystemTypeToQuotaStorageType(type),
base::Bind(&QuotaBackendImpl::DidGetUsageAndQuotaForReserveQuota,
weak_ptr_factory_.GetWeakPtr(),
- QuotaReservationInfo(origin, type, delta), callback));
+ QuotaReservationInfo(origin, type, delta),
+ callback));
}
void QuotaBackendImpl::ReleaseReservedQuota(const GURL& origin,
@@ -136,7 +139,7 @@ void QuotaBackendImpl::DidGetUsageAndQuotaForReserveQuota(
void QuotaBackendImpl::ReserveQuotaInternal(const QuotaReservationInfo& info) {
DCHECK(file_task_runner_->RunsTasksOnCurrentThread());
DCHECK(info.origin.is_valid());
- DCHECK(quota_manager_proxy_);
+ DCHECK(quota_manager_proxy_.get());
quota_manager_proxy_->NotifyStorageModified(
storage::QuotaClient::kFileSystem,
info.origin,
diff --git a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.cc b/webkit/browser/fileapi/sandbox_file_system_backend_delegate.cc
index 5894969..83d21b8 100644
--- a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.cc
+++ b/webkit/browser/fileapi/sandbox_file_system_backend_delegate.cc
@@ -191,7 +191,7 @@ SandboxFileSystemBackendDelegate::SandboxFileSystemBackendDelegate(
usage_cache())),
quota_reservation_manager_(new QuotaReservationManager(
scoped_ptr<QuotaReservationManager::QuotaBackend>(
- new QuotaBackendImpl(file_task_runner_,
+ new QuotaBackendImpl(file_task_runner_.get(),
obfuscated_file_util(),
usage_cache(),
quota_manager_proxy)))),