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

content/child/service_worker/service_worker_dispatcher.cc

 // Copyright 2013 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_dispatcher.h"
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
@@ skipping 567 matching lines @@
   if (provider == provider_contexts_.end() ||
       provider->second->registration_handle_id() != registration_handle_id ||
       provider->second->active_handle_id() == kInvalidServiceWorkerHandleId) {
     return;
   }
 
   ProviderClientMap::iterator client = provider_clients_.find(provider_id);
   if (client == provider_clients_.end())
     return;
 
-  ServiceWorkerRegistrationObjectInfo info =
-      provider->second->registration()->info();
+  ServiceWorkerRegistrationObjectInfo info;
+  ServiceWorkerVersionAttributes attrs;
+  provider->second->GetRegistrationInfoAndVersionAttributes(&info, &attrs);
+
   WebServiceWorkerRegistrationImpl* registration =
       FindServiceWorkerRegistration(info, false);
   if (!registration) {
     registration = CreateServiceWorkerRegistration(info, false);
-    ServiceWorkerVersionAttributes attrs =
-        provider->second->GetVersionAttributes();
     registration->SetInstalling(GetServiceWorker(attrs.installing, false));
     registration->SetWaiting(GetServiceWorker(attrs.waiting, false));
     registration->SetActive(GetServiceWorker(attrs.active, false));
   }
 
   // Resolve the .ready promise with the registration object.
   client->second->setReadyRegistration(registration);
 }
 
 void ServiceWorkerDispatcher::OnSetControllerServiceWorker(
@@ skipping 121 matching lines @@
         attrs.installing, thread_safe_sender_.get());
     ServiceWorkerHandleReference::Adopt(
         attrs.waiting, thread_safe_sender_.get());
     ServiceWorkerHandleReference::Adopt(
         attrs.active, thread_safe_sender_.get());
   }
   return registration;
 }
 
 }  // namespace content