Remove ExecutionContext::activeDOMObjectsAreStopped()

third_party/WebKit/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 "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 "modules/serviceworkers/ServiceWorkerWindowClientCallback.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptions.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include <memory>
+#include <utility>
 
 namespace blink {
 
 namespace {
 
 class ClientArray {
  public:
   using WebType = const WebServiceWorkerClientsInfo&;
   static HeapVector<Member<ServiceWorkerClient>> take(
       ScriptPromiseResolver*,
@@ skipping 28 matching lines @@
 }
 
 class GetCallback : public WebServiceWorkerClientCallbacks {
  public:
   explicit GetCallback(ScriptPromiseResolver* resolver)
       : m_resolver(resolver) {}
   ~GetCallback() override {}
 
   void onSuccess(
       std::unique_ptr<WebServiceWorkerClientInfo> webClient) override {
-    std::unique_ptr<WebServiceWorkerClientInfo> client =
-        wrapUnique(webClient.release());
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    std::unique_ptr<WebServiceWorkerClientInfo> client = std::move(webClient);
+    if (!m_resolver->getExecutionContext())
       return;
     if (!client) {
       // Resolve the promise with undefined.
       m_resolver->resolve();
       return;
     }
     m_resolver->resolve(
         ServiceWorkerClient::take(m_resolver, std::move(client)));
   }
 
   void onError(const WebServiceWorkerError& error) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error));
   }
 
  private:
   Persistent<ScriptPromiseResolver> m_resolver;
   WTF_MAKE_NONCOPYABLE(GetCallback);
 };
 
 }  // namespace
@@ skipping 83 matching lines @@
     return promise;
   }
   context->consumeWindowInteraction();
 
   ServiceWorkerGlobalScopeClient::from(context)->openWindow(
       parsedUrl, new NavigateClientCallback(resolver));
   return promise;
 }
 
 }  // namespace blink