| Index: third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp b/third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp
|
| index b79f4ea2e6f87910c434df582563b098a14f3e1b..2c6ae58a98b0bce58e28aee24b1e35ab58b84fa3 100644
|
| --- a/third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp
|
| @@ -6,13 +6,14 @@
|
|
|
| #include "core/dom/DOMTypedArray.h"
|
| #include "core/html/FormData.h"
|
| -#include "core/loader/ThreadableLoader.h"
|
| +#include "core/loader/MockThreadableLoader.h"
|
| #include "core/loader/ThreadableLoaderClient.h"
|
| #include "core/testing/DummyPageHolder.h"
|
| #include "modules/fetch/DataConsumerHandleTestUtil.h"
|
| #include "platform/network/ResourceResponse.h"
|
| #include "platform/testing/UnitTestHelpers.h"
|
| #include "platform/weborigin/KURL.h"
|
| +#include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefPtr.h"
|
| @@ -42,19 +43,13 @@ String toString(const Vector<char>& data)
|
| return String(data.data(), data.size());
|
| }
|
|
|
| -class NoopLoader final : public ThreadableLoader {
|
| -public:
|
| - static PassRefPtr<ThreadableLoader> create() { return adoptRef(new NoopLoader); }
|
| - void overrideTimeout(unsigned long) override {}
|
| - void cancel() override {}
|
| -};
|
| -
|
| class LoaderFactory : public FetchBlobDataConsumerHandle::LoaderFactory {
|
| public:
|
| explicit LoaderFactory(PassOwnPtr<WebDataConsumerHandle> handle) : m_handle(handle) {}
|
| PassRefPtr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClient* client, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&) override
|
| {
|
| - RefPtr<ThreadableLoader> loader = NoopLoader::create();
|
| + RefPtr<MockThreadableLoader> loader = MockThreadableLoader::create();
|
| + EXPECT_CALL(*loader, cancel()).Times(1);
|
| client->didReceiveResponse(0, ResourceResponse(), m_handle.release());
|
| return loader.release();
|
| }
|
|
|