ServiceWorker: Get registration info and its version attributes in one lock operation

content/child/service_worker/service_worker_provider_context.cc

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 f37cc65c6854dc7e49310bedbc18f8f51d79bf9f..4c19349c47f48aa005521a6943714b4666408b33 100644
--- a/content/child/service_worker/service_worker_provider_context.cc
+++ b/content/child/service_worker/service_worker_provider_context.cc
@@ -43,25 +43,24 @@ ServiceWorkerHandleReference* ServiceWorkerProviderContext::controller() {
   return controller_.get();
 }
 
-ServiceWorkerRegistrationHandleReference*
-ServiceWorkerProviderContext::registration() {
+bool ServiceWorkerProviderContext::IsAssociatedWithRegistration() {
   base::AutoLock lock(lock_);
-  return registration_.get();
+  return registration_ != nullptr;
 }
 
-ServiceWorkerVersionAttributes
-ServiceWorkerProviderContext::GetVersionAttributes() {
+void ServiceWorkerProviderContext::GetRegistrationInfoAndVersionAttributes(
+    ServiceWorkerRegistrationObjectInfo* info,
+    ServiceWorkerVersionAttributes* attrs) {
   base::AutoLock lock(lock_);
   DCHECK(registration_);
 
-  ServiceWorkerVersionAttributes attrs;
+  *info = registration_->info();
   if (installing_)
-    attrs.installing = installing_->info();
+    attrs->installing = installing_->info();
   if (waiting_)
-    attrs.waiting = waiting_->info();
+    attrs->waiting = waiting_->info();
   if (active_)
-    attrs.active = active_->info();
-  return attrs;
+    attrs->active = active_->info();
 }
 
 void ServiceWorkerProviderContext::SetVersionAttributes(