| Index: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
|
| index d6d3b300d0fa9a6455c2ac361cf715bc14ea014c..e995bff4c9397bb2e4d61cb687c5fdd1cd0f3a63 100644
|
| --- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
|
| @@ -71,12 +71,14 @@
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WorkerContentSettingsClient.h"
|
| #include "wtf/Functional.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| WebEmbeddedWorker* WebEmbeddedWorker::create(WebServiceWorkerContextClient* client, WebWorkerContentSettingsClientProxy* contentSettingsClient)
|
| {
|
| - return new WebEmbeddedWorkerImpl(adoptPtr(client), adoptPtr(contentSettingsClient));
|
| + return new WebEmbeddedWorkerImpl(wrapUnique(client), wrapUnique(contentSettingsClient));
|
| }
|
|
|
| static HashSet<WebEmbeddedWorkerImpl*>& runningWorkerInstances()
|
| @@ -85,7 +87,7 @@ static HashSet<WebEmbeddedWorkerImpl*>& runningWorkerInstances()
|
| return set;
|
| }
|
|
|
| -WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient> client, PassOwnPtr<WebWorkerContentSettingsClientProxy> contentSettingsClient)
|
| +WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(std::unique_ptr<WebServiceWorkerContextClient> client, std::unique_ptr<WebWorkerContentSettingsClientProxy> contentSettingsClient)
|
| : m_workerContextClient(std::move(client))
|
| , m_contentSettingsClient(std::move(contentSettingsClient))
|
| , m_workerInspectorProxy(WorkerInspectorProxy::create())
|
| @@ -327,7 +329,7 @@ void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame)
|
| DCHECK(m_loadingShadowPage);
|
| DCHECK(!m_askedToTerminate);
|
| m_loadingShadowPage = false;
|
| - m_networkProvider = adoptPtr(m_workerContextClient->createServiceWorkerNetworkProvider(frame->dataSource()));
|
| + m_networkProvider = wrapUnique(m_workerContextClient->createServiceWorkerNetworkProvider(frame->dataSource()));
|
| m_mainScriptLoader = WorkerScriptLoader::create();
|
| m_mainScriptLoader->setRequestContext(WebURLRequest::RequestContextServiceWorker);
|
| m_mainScriptLoader->loadAsynchronously(
|
| @@ -406,7 +408,7 @@ void WebEmbeddedWorkerImpl::startWorkerThread()
|
| provideContentSettingsClientToWorker(workerClients, std::move(m_contentSettingsClient));
|
| provideIndexedDBClientToWorker(workerClients, IndexedDBClientImpl::create());
|
| provideServiceWorkerGlobalScopeClientToWorker(workerClients, ServiceWorkerGlobalScopeClientImpl::create(*m_workerContextClient));
|
| - provideServiceWorkerContainerClientToWorker(workerClients, adoptPtr(m_workerContextClient->createServiceWorkerProvider()));
|
| + provideServiceWorkerContainerClientToWorker(workerClients, wrapUnique(m_workerContextClient->createServiceWorkerProvider()));
|
|
|
| // We need to set the CSP to both the shadow page's document and the ServiceWorkerGlobalScope.
|
| document->initContentSecurityPolicy(m_mainScriptLoader->releaseContentSecurityPolicy());
|
| @@ -414,7 +416,7 @@ void WebEmbeddedWorkerImpl::startWorkerThread()
|
| KURL scriptURL = m_mainScriptLoader->url();
|
| WorkerThreadStartMode startMode = m_workerInspectorProxy->workerStartMode(document);
|
|
|
| - OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(
|
| + std::unique_ptr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(
|
| scriptURL,
|
| m_workerStartData.userAgent,
|
| m_mainScriptLoader->script(),
|
|
|