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

content/renderer/service_worker/embedded_worker_context_client.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/renderer/service_worker/embedded_worker_context_client.h"
 
 #include <map>
 #include <string>
 
 #include "base/debug/trace_event.h"
@@ skipping 162 matching lines @@
   worker_task_runner_ = new WorkerThreadTaskRunner(
       WorkerTaskRunner::Instance()->CurrentWorkerId());
   DCHECK_NE(0, WorkerTaskRunner::Instance()->CurrentWorkerId());
   // g_worker_client_tls.Pointer()->Get() could return NULL if this context
   // gets deleted before workerContextStarted() is called.
   DCHECK(g_worker_client_tls.Pointer()->Get() == NULL);
   DCHECK(!script_context_);
   g_worker_client_tls.Pointer()->Set(this);
   script_context_.reset(new ServiceWorkerScriptContext(this, proxy));
 
-  // This can be nullptr on EmbeddedWorkerBrowserTests.
-  // TODO(nhiroki): Remove this workaround. |registration()| should always be
-  // valid other than the test because the registration association message
-  // arrives before starting the worker context.
-  if (provider_context_->registration())
-    SetRegistrationInServiceWorkerGlobalScope();
+  SetRegistrationInServiceWorkerGlobalScope();
 
   Send(new EmbeddedWorkerHostMsg_WorkerScriptLoaded(
       embedded_worker_id_,
       WorkerTaskRunner::Instance()->CurrentWorkerId()));
 
   // Schedule a task to send back WorkerStarted asynchronously,
   // so that at the time we send it we can be sure that the worker
   // script has been evaluated and worker run loop has been started.
   worker_task_runner_->PostTask(
       FROM_HERE,
@@ skipping 213 matching lines @@
                          "EmbeddedWorkerContextClient::StartingWorkerContext",
                          this);
   Send(new EmbeddedWorkerHostMsg_WorkerStarted(embedded_worker_id_));
 }
 
 void EmbeddedWorkerContextClient::SetRegistrationInServiceWorkerGlobalScope() {
   DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(provider_context_);
   DCHECK(script_context_);
 
+  ServiceWorkerRegistrationObjectInfo info;
+  ServiceWorkerVersionAttributes attrs;
+  bool found =
+      provider_context_->GetRegistrationInfoAndVersionAttributes(&info, &attrs);
+  if (!found)
+    return;  // Cannot be associated with a registration in some tests.
+
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
           thread_safe_sender());
 
-  // Register a registration with the dispatcher living on the worker thread.
-  DCHECK(provider_context_->registration());
+  // Register a registration and its version attributes with the dispatcher
+  // living on the worker thread.
   scoped_ptr<WebServiceWorkerRegistrationImpl> registration(
-      dispatcher->CreateServiceWorkerRegistration(
-          provider_context_->registration()->info(), false));
-
-  // Register workers with the dispatcher living on the worker thread.
-  ServiceWorkerVersionAttributes attrs =
-      provider_context_->GetVersionAttributes();
+      dispatcher->CreateServiceWorkerRegistration(info, false));
   registration->SetInstalling(
       dispatcher->GetServiceWorker(attrs.installing, false));
   registration->SetWaiting(
       dispatcher->GetServiceWorker(attrs.waiting, false));
   registration->SetActive(
       dispatcher->GetServiceWorker(attrs.active, false));
 
   script_context_->SetRegistrationInServiceWorkerGlobalScope(
       registration.Pass());
 }
 
 }  // namespace content