| Index: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| diff --git a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| index e998bb03a9a984f99ee6280e306dffb18078bcf8..80b9d7dcc0ce61389deb132df7367a8bbff3d2db 100644
|
| --- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| +++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| @@ -64,8 +64,8 @@
|
| #include "web/WebEmbeddedWorkerImpl.h"
|
| #include "wtf/Assertions.h"
|
| #include "wtf/Functional.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| -
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
| #include <utility>
|
|
|
| namespace blink {
|
| @@ -124,7 +124,7 @@ void ServiceWorkerGlobalScopeProxy::dispatchExtendableMessageEvent(int eventID,
|
| String origin;
|
| if (!sourceOrigin.isUnique())
|
| origin = sourceOrigin.toString();
|
| - ServiceWorker* source = ServiceWorker::from(m_workerGlobalScope->getExecutionContext(), adoptPtr(handle.release()));
|
| + ServiceWorker* source = ServiceWorker::from(m_workerGlobalScope->getExecutionContext(), wrapUnique(handle.release()));
|
| WaitUntilObserver* observer = WaitUntilObserver::create(workerGlobalScope(), WaitUntilObserver::Message, eventID);
|
|
|
| Event* event = ExtendableMessageEvent::create(value, origin, ports, source, observer);
|
| @@ -217,7 +217,7 @@ bool ServiceWorkerGlobalScopeProxy::hasFetchEventHandler()
|
| return m_workerGlobalScope->hasEventListeners(EventTypeNames::fetch);
|
| }
|
|
|
| -void ServiceWorkerGlobalScopeProxy::reportException(const String& errorMessage, PassOwnPtr<SourceLocation> location)
|
| +void ServiceWorkerGlobalScopeProxy::reportException(const String& errorMessage, std::unique_ptr<SourceLocation> location)
|
| {
|
| client().reportException(errorMessage, location->lineNumber(), location->columnNumber(), location->url());
|
| }
|
|
|