| Index: third_party/WebKit/Source/modules/presentation/PresentationConnectionCallbacks.cpp
|
| diff --git a/third_party/WebKit/Source/modules/presentation/PresentationConnectionCallbacks.cpp b/third_party/WebKit/Source/modules/presentation/PresentationConnectionCallbacks.cpp
|
| index 6573873469e4dca7afa338204832a0b865f478d8..5530be75df4596fc9dca9a66c164468b1e5dddf9 100644
|
| --- a/third_party/WebKit/Source/modules/presentation/PresentationConnectionCallbacks.cpp
|
| +++ b/third_party/WebKit/Source/modules/presentation/PresentationConnectionCallbacks.cpp
|
| @@ -11,8 +11,8 @@
|
| #include "modules/presentation/PresentationRequest.h"
|
| #include "public/platform/modules/presentation/WebPresentationConnectionClient.h"
|
| #include "public/platform/modules/presentation/WebPresentationError.h"
|
| -#include "wtf/PtrUtil.h"
|
| #include <memory>
|
| +#include <utility>
|
|
|
| namespace blink {
|
|
|
| @@ -26,12 +26,11 @@ PresentationConnectionCallbacks::PresentationConnectionCallbacks(
|
|
|
| void PresentationConnectionCallbacks::onSuccess(
|
| std::unique_ptr<WebPresentationConnectionClient>
|
| - PresentationConnectionClient) {
|
| + presentationConnectionClient) {
|
| std::unique_ptr<WebPresentationConnectionClient> result(
|
| - wrapUnique(PresentationConnectionClient.release()));
|
| + std::move(presentationConnectionClient));
|
|
|
| - if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + if (!m_resolver->getExecutionContext())
|
| return;
|
| m_resolver->resolve(PresentationConnection::take(
|
| m_resolver.get(), std::move(result), m_request));
|
| @@ -39,8 +38,7 @@ void PresentationConnectionCallbacks::onSuccess(
|
|
|
| void PresentationConnectionCallbacks::onError(
|
| const WebPresentationError& error) {
|
| - if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + if (!m_resolver->getExecutionContext())
|
| return;
|
| m_resolver->reject(PresentationError::take(m_resolver.get(), error));
|
| }
|
|
|