ServiceWorker: Make '.ready' return a promise to be resolved with ServiceWorkerRegistration (2/3)

content/browser/service_worker/service_worker_dispatcher_host.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/browser/service_worker/service_worker_dispatcher_host.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/message_port_service.h"
@@ skipping 311 matching lines @@
   if (!provider_host) {
     BadMessageReceived();
     return;
   }
   if (!provider_host->IsContextAlive())
     return;
   if (!provider_host->SetHostedVersionId(version_id))
     BadMessageReceived();
 }
 
+ServiceWorkerRegistrationObjectInfo
+ServiceWorkerDispatcherHost::GetOrCreateRegistrationHandle(
+    int provider_id,
+    ServiceWorkerRegistration* registration) {
+  ServiceWorkerRegistrationHandle* handle =
+      FindRegistrationHandle(provider_id, registration->id());
+  if (handle) {
+    handle->IncrementRefCount();
+    return handle->GetObjectInfo();
+  }
+
+  scoped_ptr<ServiceWorkerRegistrationHandle> new_handle(
+      new ServiceWorkerRegistrationHandle(
+          GetContext()->AsWeakPtr(), this, provider_id, registration));
+  ServiceWorkerRegistrationObjectInfo info = new_handle->GetObjectInfo();
+  RegisterServiceWorkerRegistrationHandle(new_handle.Pass());
+  return info;
+}
+
 ServiceWorkerRegistrationHandle*
 ServiceWorkerDispatcherHost::FindRegistrationHandle(int provider_id,
                                                     int64 registration_id) {
   for (IDMap<ServiceWorkerRegistrationHandle, IDMapOwnPointer>::iterator
            iter(&registration_handles_);
        !iter.IsAtEnd();
        iter.Advance()) {
     ServiceWorkerRegistrationHandle* handle = iter.GetCurrentValue();
     DCHECK(handle);
     if (handle->provider_id() == provider_id && handle->registration() &&
@@ skipping 16 matching lines @@
 
   if (status != SERVICE_WORKER_OK) {
     SendRegistrationError(thread_id, request_id, status);
     return;
   }
 
   ServiceWorkerRegistration* registration =
       GetContext()->GetLiveRegistration(registration_id);
   DCHECK(registration);
 
+  ServiceWorkerRegistrationObjectInfo info =
+      GetOrCreateRegistrationHandle(provider_id, registration);

[michaeln, 2014/09/04 00:27:23]

seems like GetOrCreateRegistrationHandle() should return handle ptr instead of
an info struct given how its named, info easy easy enough to get with the
handle->GetObject() method

[nhiroki, 2014/09/08 15:55:51]

Done in the separate CL (https://codereview.chromium.org/552693002/)

+
   ServiceWorkerRegistrationHandle* handle =
       FindRegistrationHandle(provider_id, registration_id);
-  ServiceWorkerRegistrationObjectInfo info;
-  if (handle) {
-    handle->IncrementRefCount();
-    info = handle->GetObjectInfo();
-  } else {
-    scoped_ptr<ServiceWorkerRegistrationHandle> new_handle(
-        new ServiceWorkerRegistrationHandle(
-            GetContext()->AsWeakPtr(), this, provider_id, registration));
-    info = new_handle->GetObjectInfo();
-    handle = new_handle.get();
-    RegisterServiceWorkerRegistrationHandle(new_handle.Pass());
-  }
+  DCHECK(handle);
 
   ServiceWorkerVersionAttributes attrs;
   attrs.installing = handle->CreateServiceWorkerHandleAndPass(
       registration->installing_version());
   attrs.waiting = handle->CreateServiceWorkerHandleAndPass(
       registration->waiting_version());
   attrs.active = handle->CreateServiceWorkerHandleAndPass(
       registration->active_version());
 
   Send(new ServiceWorkerMsg_ServiceWorkerRegistered(
@@ skipping 160 matching lines @@
       status, &error_type, &error_message);
   Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
       thread_id, request_id, error_type, error_message));
 }
 
 ServiceWorkerContextCore* ServiceWorkerDispatcherHost::GetContext() {
   return context_wrapper_->context();
 }
 
 }  // namespace content