BackgroundSyncManager tracks client registrations

content/renderer/service_worker/service_worker_context_client.cc

Index: content/renderer/service_worker/service_worker_context_client.cc
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index 71c1803c3efc960535e0f7397107cbb31f40c33b..898747b1005caa3c01777ebbde0872a797bc42a0 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -352,12 +352,19 @@ void ServiceWorkerContextClient::workerContextStarted(
   // willDestroyWorkerContext.
   context_.reset(new WorkerContextData(this));
 
+  ServiceWorkerRegistrationObjectInfo registration_info;
+  ServiceWorkerVersionAttributes version_attrs;
+  provider_context_->GetRegistrationInfoAndVersionAttributes(&registration_info,
+                                                             &version_attrs);
+  DCHECK_NE(registration_info.registration_id,
+            kInvalidServiceWorkerRegistrationId);
+
   // Register Mojo services.
   context_->service_registry.ServiceRegistry::AddService(
       base::Bind(&ServicePortDispatcherImpl::Create,
                  context_->proxy_weak_factory.GetWeakPtr()));
-  context_->service_registry.ServiceRegistry::AddService(
-      base::Bind(&BackgroundSyncClientImpl::Create));
+  context_->service_registry.ServiceRegistry::AddService(base::Bind(
+      &BackgroundSyncClientImpl::Create, registration_info.registration_id));
 
   SetRegistrationInServiceWorkerGlobalScope();