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

Unified Diff: content/child/service_worker/service_worker_provider_context.cc

Issue 506093002: Remove implicit conversions from scoped_refptr to T* in content/*/service_worker/ (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: content/child/service_worker/service_worker_provider_context.cc
diff --git a/content/child/service_worker/service_worker_provider_context.cc b/content/child/service_worker/service_worker_provider_context.cc
index 222a8611cd682d6a459f166afce81b57bee1f75f..3dfcff84e8cbf025ff64f75ee9627d9ec2a14e92 100644
--- a/content/child/service_worker/service_worker_provider_context.cc
+++ b/content/child/service_worker/service_worker_provider_context.cc
@@ -24,7 +24,7 @@ ServiceWorkerProviderContext::ServiceWorkerProviderContext(int provider_id)
thread_safe_sender_ = ChildThread::current()->thread_safe_sender();
ServiceWorkerDispatcher* dispatcher =
ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
- thread_safe_sender_);
+ thread_safe_sender_.get());
DCHECK(dispatcher);
dispatcher->AddProviderContext(this);
}
@@ -83,21 +83,24 @@ void ServiceWorkerProviderContext::OnSetInstallingServiceWorker(
int provider_id,
const ServiceWorkerObjectInfo& info) {
DCHECK_EQ(provider_id_, provider_id);
- installing_ = ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
+ installing_ =
+ ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_.get());
}
void ServiceWorkerProviderContext::OnSetWaitingServiceWorker(
int provider_id,
const ServiceWorkerObjectInfo& info) {
DCHECK_EQ(provider_id_, provider_id);
- waiting_ = ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
+ waiting_ =
+ ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_.get());
}
void ServiceWorkerProviderContext::OnSetActiveServiceWorker(
int provider_id,
const ServiceWorkerObjectInfo& info) {
DCHECK_EQ(provider_id_, provider_id);
- active_ = ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
+ active_ =
+ ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_.get());
}
void ServiceWorkerProviderContext::OnSetControllerServiceWorker(
@@ -107,7 +110,8 @@ void ServiceWorkerProviderContext::OnSetControllerServiceWorker(
// This context is is the primary owner of this handle, keeps the
// initial reference until it goes away.
- controller_ = ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
+ controller_ =
+ ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_.get());
// TODO(kinuko): We can forward the message to other threads here
// when we support navigator.serviceWorker in dedicated workers.

Powered by Google App Engine
This is Rietveld 408576698