| Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
|
| index 330860bf76a81c71b0b83aa29241d3e9c225ff16..7abf63fb45d58e1472ce2a6ab36e642641749d47 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
|
| @@ -37,6 +37,7 @@
|
| #include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
|
| #include "wtf/Assertions.h"
|
| #include "wtf/Forward.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -55,7 +56,7 @@ typedef RequestOrUSVString RequestInfo;
|
| class MODULES_EXPORT ServiceWorkerGlobalScope final : public WorkerGlobalScope {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - static ServiceWorkerGlobalScope* create(ServiceWorkerThread*, PassOwnPtr<WorkerThreadStartupData>);
|
| + static ServiceWorkerGlobalScope* create(ServiceWorkerThread*, std::unique_ptr<WorkerThreadStartupData>);
|
|
|
| ~ServiceWorkerGlobalScope() override;
|
| bool isServiceWorkerGlobalScope() const override { return true; }
|
| @@ -92,10 +93,10 @@ protected:
|
| bool addEventListenerInternal(const AtomicString& eventType, EventListener*, const AddEventListenerOptions&) override;
|
|
|
| private:
|
| - ServiceWorkerGlobalScope(const KURL&, const String& userAgent, ServiceWorkerThread*, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData>, WorkerClients*);
|
| + ServiceWorkerGlobalScope(const KURL&, const String& userAgent, ServiceWorkerThread*, double timeOrigin, std::unique_ptr<SecurityOrigin::PrivilegeData>, WorkerClients*);
|
| void importScripts(const Vector<String>& urls, ExceptionState&) override;
|
| CachedMetadataHandler* createWorkerScriptCachedMetadataHandler(const KURL& scriptURL, const Vector<char>* metaData) override;
|
| - void logExceptionToConsole(const String& errorMessage, PassOwnPtr<SourceLocation>) override;
|
| + void logExceptionToConsole(const String& errorMessage, std::unique_ptr<SourceLocation>) override;
|
| void scriptLoaded(size_t scriptSize, size_t cachedMetadataSize) override;
|
|
|
| Member<ServiceWorkerClients> m_clients;
|
|
|