| Index: third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp
|
| diff --git a/third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp b/third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp
|
| index 2b7b851f2a484106ee847a1765118fa56b1af054..14c6875f122209b3f58e6253f96656b80406a6dc 100644
|
| --- a/third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp
|
| +++ b/third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp
|
| @@ -33,14 +33,12 @@
|
| #include "core/workers/SharedWorkerGlobalScope.h"
|
| #include "core/workers/WorkerBackingThread.h"
|
| #include "core/workers/WorkerThreadStartupData.h"
|
| -#include "wtf/PtrUtil.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| -std::unique_ptr<SharedWorkerThread> SharedWorkerThread::create(const String& name, PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerReportingProxy& workerReportingProxy)
|
| +PassOwnPtr<SharedWorkerThread> SharedWorkerThread::create(const String& name, PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerReportingProxy& workerReportingProxy)
|
| {
|
| - return wrapUnique(new SharedWorkerThread(name, workerLoaderProxy, workerReportingProxy));
|
| + return adoptPtr(new SharedWorkerThread(name, workerLoaderProxy, workerReportingProxy));
|
| }
|
|
|
| SharedWorkerThread::SharedWorkerThread(const String& name, PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerReportingProxy& workerReportingProxy)
|
| @@ -54,7 +52,7 @@ SharedWorkerThread::~SharedWorkerThread()
|
| {
|
| }
|
|
|
| -WorkerGlobalScope* SharedWorkerThread::createWorkerGlobalScope(std::unique_ptr<WorkerThreadStartupData> startupData)
|
| +WorkerGlobalScope* SharedWorkerThread::createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupData> startupData)
|
| {
|
| return SharedWorkerGlobalScope::create(m_name, this, std::move(startupData));
|
| }
|
|
|