| Index: third_party/WebKit/Source/core/loader/PingLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/PingLoader.cpp b/third_party/WebKit/Source/core/loader/PingLoader.cpp
|
| index f7b637a8133635c88ca5862e67a4735a977a1518..bef3da748378139c565f42258f31949b48c8d4f3 100644
|
| --- a/third_party/WebKit/Source/core/loader/PingLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/PingLoader.cpp
|
| @@ -35,7 +35,6 @@
|
| #include "core/dom/DOMArrayBufferView.h"
|
| #include "core/dom/Document.h"
|
| #include "core/dom/SecurityContext.h"
|
| -#include "core/dom/TaskRunnerHelper.h"
|
| #include "core/fetch/CrossOriginAccessControl.h"
|
| #include "core/fetch/FetchContext.h"
|
| #include "core/fetch/FetchInitiatorTypeNames.h"
|
| @@ -54,7 +53,6 @@
|
| #include "core/loader/FrameLoaderClient.h"
|
| #include "core/loader/MixedContentChecker.h"
|
| #include "core/page/Page.h"
|
| -#include "platform/Timer.h"
|
| #include "platform/WebFrameScheduler.h"
|
| #include "platform/exported/WrappedResourceRequest.h"
|
| #include "platform/exported/WrappedResourceResponse.h"
|
| @@ -220,7 +218,7 @@ class PingLoaderImpl : public GarbageCollectedFinalized<PingLoaderImpl>,
|
| void didFailLoading(LocalFrame*);
|
|
|
| std::unique_ptr<WebURLLoader> m_loader;
|
| - TaskRunnerTimer<PingLoaderImpl> m_timeout;
|
| + Timer<PingLoaderImpl> m_timeout;
|
| String m_url;
|
| unsigned long m_identifier;
|
| SelfKeepAlive<PingLoaderImpl> m_keepAlive;
|
| @@ -238,9 +236,7 @@ PingLoaderImpl::PingLoaderImpl(LocalFrame* frame,
|
| StoredCredentials credentialsAllowed,
|
| bool isBeacon)
|
| : ContextClient(frame),
|
| - m_timeout(TaskRunnerHelper::get(TaskType::Networking, frame),
|
| - this,
|
| - &PingLoaderImpl::timeout),
|
| + m_timeout(this, &PingLoaderImpl::timeout),
|
| m_url(request.url()),
|
| m_identifier(createUniqueIdentifier()),
|
| m_keepAlive(this),
|
|
|