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

Unified Diff: content/child/service_worker/service_worker_dispatcher.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_dispatcher.cc
diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc
index 0322bb25d221a04a26b9f253de03316a3f013adc..779a4f461009e13e68cfcb368c51b0283dfa231c 100644
--- a/content/child/service_worker/service_worker_dispatcher.cc
+++ b/content/child/service_worker/service_worker_dispatcher.cc
@@ -190,17 +190,18 @@ WebServiceWorkerImpl* ServiceWorkerDispatcher::GetServiceWorker(
if (adopt_handle) {
// We are instructed to adopt a handle but we already have one, so
// adopt and destroy a handle ref.
- ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
+ ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_.get());
}
return existing_worker->second;
}
scoped_ptr<ServiceWorkerHandleReference> handle_ref =
adopt_handle
- ? ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_)
- : ServiceWorkerHandleReference::Create(info, thread_safe_sender_);
+ ? ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_.get())
+ : ServiceWorkerHandleReference::Create(info,
+ thread_safe_sender_.get());
// WebServiceWorkerImpl constructor calls AddServiceWorker.
- return new WebServiceWorkerImpl(handle_ref.Pass(), thread_safe_sender_);
+ return new WebServiceWorkerImpl(handle_ref.Pass(), thread_safe_sender_.get());
}
WebServiceWorkerRegistrationImpl*
@@ -218,17 +219,16 @@ ServiceWorkerDispatcher::GetServiceWorkerRegistration(
// We are instructed to adopt a handle but we already have one, so
// adopt and destroy a handle ref.
ServiceWorkerRegistrationHandleReference::Adopt(
- info, thread_safe_sender_);
+ info, thread_safe_sender_.get());
}
return existing_registration->second;
}
scoped_ptr<ServiceWorkerRegistrationHandleReference> handle_ref =
- adopt_handle
- ? ServiceWorkerRegistrationHandleReference::Adopt(
- info, thread_safe_sender_)
- : ServiceWorkerRegistrationHandleReference::Create(
- info, thread_safe_sender_);
+ adopt_handle ? ServiceWorkerRegistrationHandleReference::Adopt(
+ info, thread_safe_sender_.get())
+ : ServiceWorkerRegistrationHandleReference::Create(
+ info, thread_safe_sender_.get());
// WebServiceWorkerRegistrationImpl constructor calls
// AddServiceWorkerRegistration.

Powered by Google App Engine
This is Rietveld 408576698