ThreadableLoader::cancel should be called before loader destruction

third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/loader/ThreadableLoader.h"
 
 #include "core/dom/CrossThreadTask.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/DocumentThreadableLoader.h"
@@ skipping 79 matching lines @@
     WorkerThreadableLoaderTest
 };
 
 class ThreadableLoaderTestHelper {
 public:
     virtual ~ThreadableLoaderTestHelper() { }
 
     virtual void createLoader(ThreadableLoaderClient*, CrossOriginRequestPolicy) = 0;
     virtual void startLoader(const ResourceRequest&) = 0;
     virtual void cancelLoader() = 0;
+    virtual void cancelAndClearLoader() = 0;
     virtual void clearLoader() = 0;
     virtual Checkpoint& checkpoint() = 0;
     virtual void callCheckpoint(int) = 0;
     virtual void onSetUp() = 0;
     virtual void onServeRequests() = 0;
     virtual void onTearDown() = 0;
 };
 
 class DocumentThreadableLoaderTestHelper : public ThreadableLoaderTestHelper {
 public:
     DocumentThreadableLoaderTestHelper()
         : m_dummyPageHolder(DummyPageHolder::create(IntSize(1, 1)))
     {
     }
 
     void createLoader(ThreadableLoaderClient* client, CrossOriginRequestPolicy crossOriginRequestPolicy) override
     {
         ThreadableLoaderOptions options;
         options.crossOriginRequestPolicy = crossOriginRequestPolicy;
         ResourceLoaderOptions resourceLoaderOptions;
         m_loader = DocumentThreadableLoader::create(document(), client, options, resourceLoaderOptions);
     }
 
     void startLoader(const ResourceRequest& request) override
     {
         m_loader->start(request);
     }
 
     void cancelLoader() override { m_loader->cancel(); }
-    void clearLoader() override { m_loader.reset(); }
+    void cancelAndClearLoader() override
+    {
+        m_loader->cancel();
+        m_loader = nullptr;
+    }
+    void clearLoader() override { m_loader = nullptr; }
     Checkpoint& checkpoint() override { return m_checkpoint; }
     void callCheckpoint(int n) override { m_checkpoint.Call(n); }
 
     void onSetUp() override
     {
     }
 
     void onServeRequests() override
     {
     }
 
     void onTearDown() override
     {
-        m_loader.reset();
+        if (m_loader) {
+            m_loader->cancel();
+            m_loader = nullptr;
+        }
     }
 
 private:
     Document& document() { return m_dummyPageHolder->document(); }
 
     std::unique_ptr<DummyPageHolder> m_dummyPageHolder;
     Checkpoint m_checkpoint;
     std::unique_ptr<DocumentThreadableLoader> m_loader;
 };
 
@@ skipping 28 matching lines @@
     }
 
     // Must be called on the worker thread.
     void cancelLoader() override
     {
         ASSERT(m_workerThread);
         ASSERT(m_workerThread->isCurrentThread());
         m_loader->cancel();
     }
 
+    void cancelAndClearLoader() override
+    {
+        DCHECK(m_workerThread);
+        DCHECK(m_workerThread->isCurrentThread());
+        m_loader->cancel();
+        m_loader = nullptr;
+    }
+
     // Must be called on the worker thread.
     void clearLoader() override
     {
         ASSERT(m_workerThread);
         ASSERT(m_workerThread->isCurrentThread());
         m_loader.reset();
     }
 
     Checkpoint& checkpoint() override
     {
@@ skipping 132 matching lines @@
     }
 
     void startLoader(const KURL& url)
     {
         ResourceRequest request(url);
         request.setRequestContext(WebURLRequest::RequestContextObject);
         m_helper->startLoader(request);
     }
 
     void cancelLoader() { m_helper->cancelLoader(); }
+    void cancelAndClearLoader() { m_helper->cancelAndClearLoader(); }
     void clearLoader() { m_helper->clearLoader(); }
     Checkpoint& checkpoint() { return m_helper->checkpoint(); }
     void callCheckpoint(int n) { m_helper->callCheckpoint(n); }
 
     void serveRequests()
     {
         m_helper->onServeRequests();
         Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
     }
 
@@ skipping 94 matching lines @@
     EXPECT_CALL(checkpoint(), Call(2)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::cancelLoader));
     EXPECT_CALL(*client(), didFail(Truly(isCancellation)));
     EXPECT_CALL(checkpoint(), Call(3));
 
     startLoader(successURL());
     callCheckpoint(2);
     callCheckpoint(3);
     serveRequests();
 }
 
-TEST_P(ThreadableLoaderTest, ClearAfterStart)
+TEST_P(ThreadableLoaderTest, CancelAndClearAfterStart)
 {
     InSequence s;
     EXPECT_CALL(checkpoint(), Call(1));
     createLoader();
     callCheckpoint(1);
 
-    EXPECT_CALL(checkpoint(), Call(2)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
+    EXPECT_CALL(checkpoint(), Call(2)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::cancelAndClearLoader));
+    EXPECT_CALL(*client(), didFail(Truly(isCancellation)));
     EXPECT_CALL(checkpoint(), Call(3));
 
     startLoader(successURL());
     callCheckpoint(2);
     callCheckpoint(3);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, CancelInDidReceiveResponse)
 {
     InSequence s;
     EXPECT_CALL(checkpoint(), Call(1));
     createLoader();
     callCheckpoint(1);
 
     EXPECT_CALL(checkpoint(), Call(2));
     EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::cancelLoader));
     EXPECT_CALL(*client(), didFail(Truly(isCancellation)));
 
     startLoader(successURL());
     callCheckpoint(2);
     serveRequests();
 }
 
-TEST_P(ThreadableLoaderTest, ClearInDidReceiveResponse)
+TEST_P(ThreadableLoaderTest, CancelAndClearInDidReceiveResponse)
 {
     InSequence s;
     EXPECT_CALL(checkpoint(), Call(1));
     createLoader();
     callCheckpoint(1);
 
     EXPECT_CALL(checkpoint(), Call(2));
-    EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
+    EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::cancelAndClearLoader));
+    EXPECT_CALL(*client(), didFail(Truly(isCancellation)));
 
     startLoader(successURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, CancelInDidReceiveData)
 {
     InSequence s;
     EXPECT_CALL(checkpoint(), Call(1));
     createLoader();
     callCheckpoint(1);
 
     EXPECT_CALL(checkpoint(), Call(2));
     EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _));
     EXPECT_CALL(*client(), didReceiveData(_, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::cancelLoader));
     EXPECT_CALL(*client(), didFail(Truly(isCancellation)));
 
     startLoader(successURL());
     callCheckpoint(2);
     serveRequests();
 }
 
-TEST_P(ThreadableLoaderTest, ClearInDidReceiveData)
+TEST_P(ThreadableLoaderTest, CancelAndClearInDidReceiveData)
 {
     InSequence s;
     EXPECT_CALL(checkpoint(), Call(1));
     createLoader();
     callCheckpoint(1);
 
     EXPECT_CALL(checkpoint(), Call(2));
     EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _));
-    EXPECT_CALL(*client(), didReceiveData(_, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
+    EXPECT_CALL(*client(), didReceiveData(_, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::cancelAndClearLoader));
+    EXPECT_CALL(*client(), didFail(Truly(isCancellation)));
 
     startLoader(successURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, DidFinishLoading)
 {
     InSequence s;
     EXPECT_CALL(checkpoint(), Call(1));
     createLoader();
     callCheckpoint(1);
 
     EXPECT_CALL(checkpoint(), Call(2));
     EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _));
     EXPECT_CALL(*client(), didReceiveData(StrEq("fox"), 4));
+    // We expect didReceiveResourceTiming() calls in DocumentThreadableLoader;
+    // it's used to connect DocumentThreadableLoader to WorkerThreadableLoader,
+    // not to ThreadableLoaderClient.
     EXPECT_CALL(*client(), didReceiveResourceTiming(_));
     EXPECT_CALL(*client(), didFinishLoading(_, _));
 
     startLoader(successURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, CancelInDidFinishLoading)
 {
@@ skipping 264 matching lines @@
     EXPECT_CALL(*client(), didFailRedirectCheck()).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
 
     startLoader(redirectLoopURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 } // namespace
 
 } // namespace blink