| Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp
|
| index b822eb7be0155159721be346462fca5483a3334e..d93e6720524f850c52aa650598287da879efd5da 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp
|
| @@ -8,22 +8,20 @@
|
| #include "core/dom/DOMException.h"
|
| #include "modules/serviceworkers/ServiceWorkerError.h"
|
| #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
|
| -#include "wtf/PtrUtil.h"
|
| +#include <utility>
|
|
|
| namespace blink {
|
|
|
| void NavigateClientCallback::onSuccess(
|
| std::unique_ptr<WebServiceWorkerClientInfo> clientInfo) {
|
| - if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + if (!m_resolver->getExecutionContext())
|
| return;
|
| - m_resolver->resolve(ServiceWorkerWindowClient::take(
|
| - m_resolver.get(), wrapUnique(clientInfo.release())));
|
| + m_resolver->resolve(
|
| + ServiceWorkerWindowClient::take(m_resolver.get(), std::move(clientInfo)));
|
| }
|
|
|
| void NavigateClientCallback::onError(const WebServiceWorkerError& error) {
|
| - if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + if (!m_resolver->getExecutionContext())
|
| return;
|
|
|
| if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) {
|
|
|