ServiceWorker: Replace RegistrationCallback and GetRegistrationsCallback with CallbackPromiseAdapter

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h

 // 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.
 
 #ifndef ServiceWorkerRegistration_h
 #define ServiceWorkerRegistration_h
 
 #include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/ActiveDOMObject.h"
@@ skipping 19 matching lines @@
     : public EventTargetWithInlineData,
       public ActiveScriptWrappable,
       public ActiveDOMObject,
       public WebServiceWorkerRegistrationProxy,
       public Supplementable<ServiceWorkerRegistration> {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration);
   USING_PRE_FINALIZER(ServiceWorkerRegistration, dispose);
 
  public:
+  // Called from CallbackPromiseAdapter.
+  using WebType = std::unique_ptr<WebServiceWorkerRegistration::Handle>;
+  static ServiceWorkerRegistration* take(
+      ScriptPromiseResolver*,
+      std::unique_ptr<WebServiceWorkerRegistration::Handle>);
+
   // ScriptWrappable overrides.
   bool hasPendingActivity() const final;
 
   // EventTarget overrides.
   const AtomicString& interfaceName() const override;
   ExecutionContext* getExecutionContext() const override {
     return ActiveDOMObject::getExecutionContext();
   }
 
   // WebServiceWorkerRegistrationProxy overrides.
@@ skipping 45 matching lines @@
   Member<ServiceWorker> m_active;
   Member<NavigationPreloadManager> m_navigationPreload;
 
   bool m_stopped;
 };
 
 class ServiceWorkerRegistrationArray {
   STATIC_ONLY(ServiceWorkerRegistrationArray);
 
  public:
+  // Called from CallbackPromiseAdapter.
+  using WebType = std::unique_ptr<
+      WebVector<std::unique_ptr<WebServiceWorkerRegistration::Handle>>>;
   static HeapVector<Member<ServiceWorkerRegistration>> take(
       ScriptPromiseResolver* resolver,
-      Vector<std::unique_ptr<WebServiceWorkerRegistration::Handle>>*
-          webServiceWorkerRegistrations) {
+      WebType webServiceWorkerRegistrations) {
     HeapVector<Member<ServiceWorkerRegistration>> registrations;
-    for (auto& registration : *webServiceWorkerRegistrations)
-      registrations.append(ServiceWorkerRegistration::getOrCreate(
-          resolver->getExecutionContext(), std::move(registration)));
+    for (auto& registration : *webServiceWorkerRegistrations) {
+      registrations.append(
+          ServiceWorkerRegistration::take(resolver, std::move(registration)));
+    }
     return registrations;
   }
 };
 
 }  // namespace blink
 
 #endif  // ServiceWorkerRegistration_h