| Index: third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp b/third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp
|
| index 4bfe9a855d2069a63fc18e3a5feaac64e6a2edfc..bbda6d04ab3aac6094d8507ef7103297bc22b227 100644
|
| --- a/third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp
|
| @@ -17,13 +17,16 @@
|
|
|
| namespace blink {
|
|
|
| -class MockLinkLoaderClient : public LinkLoaderClient {
|
| +class MockLinkLoaderClient final : public NoBaseWillBeGarbageCollectedFinalized<MockLinkLoaderClient>, public LinkLoaderClient {
|
| + WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MockLinkLoaderClient);
|
| public:
|
| - MockLinkLoaderClient(bool shouldLoad)
|
| - : m_shouldLoad(shouldLoad)
|
| + static PassOwnPtrWillBeRawPtr<MockLinkLoaderClient> create(bool shouldLoad)
|
| {
|
| + return adoptPtrWillBeNoop(new MockLinkLoaderClient(shouldLoad));
|
| }
|
|
|
| + DEFINE_INLINE_VIRTUAL_TRACE() { LinkLoaderClient::trace(visitor); }
|
| +
|
| bool shouldLoadLink() override
|
| {
|
| return m_shouldLoad;
|
| @@ -37,6 +40,11 @@ public:
|
| void didSendDOMContentLoadedForLinkPrerender() override {}
|
|
|
| private:
|
| + explicit MockLinkLoaderClient(bool shouldLoad)
|
| + : m_shouldLoad(shouldLoad)
|
| + {
|
| + }
|
| +
|
| bool m_shouldLoad;
|
| };
|
|
|
| @@ -101,8 +109,8 @@ TEST(LinkLoaderTest, Preload)
|
| for (const auto& testCase : cases) {
|
| OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
|
| dummyPageHolder->frame().settings()->setScriptEnabled(true);
|
| - MockLinkLoaderClient loaderClient(testCase.shouldLoad);
|
| - OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(&loaderClient);
|
| + OwnPtrWillBePersistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
|
| + OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
|
| KURL hrefURL = KURL(KURL(), testCase.href);
|
| loader->loadLink(LinkRelAttribute("preload"),
|
| CrossOriginAttributeNotSet,
|
| @@ -148,8 +156,8 @@ TEST(LinkLoaderTest, DNSPrefetch)
|
| for (const auto& testCase : cases) {
|
| OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
|
| dummyPageHolder->document().settings()->setDNSPrefetchingEnabled(true);
|
| - MockLinkLoaderClient loaderClient(testCase.shouldLoad);
|
| - OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(&loaderClient);
|
| + OwnPtrWillBePersistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
|
| + OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
|
| KURL hrefURL = KURL(KURL(ParsedURLStringTag(), String("http://example.com")), testCase.href);
|
| NetworkHintsMock networkHints;
|
| loader->loadLink(LinkRelAttribute("dns-prefetch"),
|
| @@ -182,8 +190,8 @@ TEST(LinkLoaderTest, Preconnect)
|
| // Test the cases with a single header
|
| for (const auto& testCase : cases) {
|
| OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
|
| - MockLinkLoaderClient loaderClient(testCase.shouldLoad);
|
| - OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(&loaderClient);
|
| + OwnPtrWillBePersistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
|
| + OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
|
| KURL hrefURL = KURL(KURL(ParsedURLStringTag(), String("http://example.com")), testCase.href);
|
| NetworkHintsMock networkHints;
|
| loader->loadLink(LinkRelAttribute("preconnect"),
|
|
|