| Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
| diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.h b/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
| index 9a0036200c6eaffc42c66a1b5bfc0877dd4dd059..3c6753360f4214ba0ea4507439995b7b8922fc9c 100644
|
| --- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
| +++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
| @@ -42,8 +42,8 @@
|
| #include "public/web/WebDevToolsAgentClient.h"
|
| #include "public/web/WebFrameClient.h"
|
| #include "public/web/WebSharedWorkerClient.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| #include "wtf/RefPtr.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -75,7 +75,7 @@ public:
|
| explicit WebSharedWorkerImpl(WebSharedWorkerClient*);
|
|
|
| // WorkerReportingProxy methods:
|
| - void reportException(const WTF::String&, PassOwnPtr<SourceLocation>) override;
|
| + void reportException(const WTF::String&, std::unique_ptr<SourceLocation>) override;
|
| void reportConsoleMessage(ConsoleMessage*) override;
|
| void postMessageToPageInspector(const WTF::String&) override;
|
| void postWorkerConsoleAgentEnabled() override { }
|
| @@ -141,11 +141,11 @@ private:
|
| bool m_askedToTerminate;
|
|
|
| // This one is bound to and used only on the main thread.
|
| - OwnPtr<WebServiceWorkerNetworkProvider> m_networkProvider;
|
| + std::unique_ptr<WebServiceWorkerNetworkProvider> m_networkProvider;
|
|
|
| Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
|
|
|
| - OwnPtr<WorkerThread> m_workerThread;
|
| + std::unique_ptr<WorkerThread> m_workerThread;
|
|
|
| WebSharedWorkerClient* m_client;
|
|
|
|
|