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

content/child/service_worker/service_worker_provider_context.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/service_worker/service_worker_provider_context.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
 #include "content/child/child_thread.h"
@@ skipping 25 matching lines @@
     // Remove this context from the dispatcher living on the main thread.
     dispatcher->RemoveProviderContext(this);
   }
 }
 
 ServiceWorkerHandleReference* ServiceWorkerProviderContext::controller() {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return controller_.get();
 }
 
-ServiceWorkerRegistrationHandleReference*
-ServiceWorkerProviderContext::registration() {
+bool ServiceWorkerProviderContext::GetRegistrationInfoAndVersionAttributes(
+    ServiceWorkerRegistrationObjectInfo* info,
+    ServiceWorkerVersionAttributes* attrs) {
   base::AutoLock lock(lock_);
-  return registration_.get();
-}
+  if (!registration_)
+    return false;
 
-ServiceWorkerVersionAttributes
-ServiceWorkerProviderContext::GetVersionAttributes() {
-  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();
+  return true;
 }
 
 void ServiceWorkerProviderContext::SetVersionAttributes(
     ChangedVersionAttributesMask mask,
     const ServiceWorkerVersionAttributes& attrs) {
   base::AutoLock lock(lock_);
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   DCHECK(registration_);
 
   if (mask.installing_changed()) {
@@ skipping 112 matching lines @@
 
 void ServiceWorkerProviderContext::DestructOnMainThread() const {
   if (!main_thread_loop_proxy_->RunsTasksOnCurrentThread() &&
       main_thread_loop_proxy_->DeleteSoon(FROM_HERE, this)) {
     return;
   }
   delete this;
 }
 
 }  // namespace content