CallbackPromiseAdapter types should be more compatible with WebCallbacks (1/3).

Source/modules/serviceworkers/ServiceWorkerClients.cpp

 // 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.
 
 #include "config.h"
 #include "modules/serviceworkers/ServiceWorkerClients.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLocation.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
 #include "public/platform/WebServiceWorkerClientQueryOptions.h"
 #include "public/platform/WebServiceWorkerClientsInfo.h"
+#include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 namespace {
 
 class ClientArray {
 public:
-    typedef WebServiceWorkerClientsInfo WebType;
-    static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*, PassOwnPtr<WebType> webClients)
+    using WebType = OwnPtr<WebServiceWorkerClientsInfo>;
+    static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*, PassOwnPtr<WebServiceWorkerClientsInfo> webClients)
     {
         HeapVector<Member<ServiceWorkerClient>> clients;
         for (size_t i = 0; i < webClients->clients.size(); ++i) {
             const WebServiceWorkerClientInfo& client = webClients->clients[i];
             if (client.clientType == WebServiceWorkerClientTypeWindow)
                 clients.append(ServiceWorkerWindowClient::create(client));
             else
                 clients.append(ServiceWorkerClient::create(client));
         }
         return clients;
@@ skipping 83 matching lines @@
         resolver->reject(DOMException::create(InvalidAccessError, "Not allowed to open a window."));
         return promise;
     }
     context->consumeWindowInteraction();
 
     ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new CallbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver));
     return promise;
 }
 
 } // namespace blink