ThreadableLoader::cancel should be called before loader destruction

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

Index: third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
index 50b8d2411182ec175d37d118dc4f1c7589ecd02a..fcfa7ef53aadd2a43107ddcb1501664fbf67c984 100644
--- a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
+++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
@@ -140,7 +140,10 @@ public:
 
     void onTearDown() override
     {
-        m_loader.reset();
+        if (m_loader) {
+            m_loader->cancel();
+            m_loader.reset();
+        }
     }
 
 private:
@@ -455,22 +458,6 @@ TEST_P(ThreadableLoaderTest, CancelAfterStart)
     serveRequests();
 }
 
-TEST_P(ThreadableLoaderTest, ClearAfterStart)

[hiroshige, 2016/07/19 06:56:14]

How about keeping these Clear.* tests by adding cancel() calls to
DocumentThreadableLoaderTestHelper/WorkerThreadableLoaderTestHelper::clearLoader(),
in order to check that we can safely destruct ThreadableLoader synchronously in
the ThreadableLoaderClient callbacks?

[yhirano, 2016/07/19 08:05:04]

Done.

-{
-    InSequence s;
-    EXPECT_CALL(checkpoint(), Call(1));
-    createLoader();
-    callCheckpoint(1);
-
-    EXPECT_CALL(checkpoint(), Call(2)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
-    EXPECT_CALL(checkpoint(), Call(3));
-
-    startLoader(successURL());
-    callCheckpoint(2);
-    callCheckpoint(3);
-    serveRequests();
-}
-
 TEST_P(ThreadableLoaderTest, CancelInDidReceiveResponse)
 {
     InSequence s;
@@ -487,21 +474,6 @@ TEST_P(ThreadableLoaderTest, CancelInDidReceiveResponse)
     serveRequests();
 }
 
-TEST_P(ThreadableLoaderTest, ClearInDidReceiveResponse)
-{
-    InSequence s;
-    EXPECT_CALL(checkpoint(), Call(1));
-    createLoader();
-    callCheckpoint(1);
-
-    EXPECT_CALL(checkpoint(), Call(2));
-    EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
-
-    startLoader(successURL());
-    callCheckpoint(2);
-    serveRequests();
-}
-
 TEST_P(ThreadableLoaderTest, CancelInDidReceiveData)
 {
     InSequence s;
@@ -519,22 +491,6 @@ TEST_P(ThreadableLoaderTest, CancelInDidReceiveData)
     serveRequests();
 }
 
-TEST_P(ThreadableLoaderTest, ClearInDidReceiveData)
-{
-    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));
-
-    startLoader(successURL());
-    callCheckpoint(2);
-    serveRequests();
-}
-
 TEST_P(ThreadableLoaderTest, DidFinishLoading)
 {
     InSequence s;
@@ -571,24 +527,6 @@ TEST_P(ThreadableLoaderTest, CancelInDidFinishLoading)
     serveRequests();
 }
 
-TEST_P(ThreadableLoaderTest, ClearInDidFinishLoading)
-{
-    InSequence s;
-    EXPECT_CALL(checkpoint(), Call(1));
-    createLoader();
-    callCheckpoint(1);
-
-    EXPECT_CALL(checkpoint(), Call(2));
-    EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _));
-    EXPECT_CALL(*client(), didReceiveData(_, _));
-    EXPECT_CALL(*client(), didReceiveResourceTiming(_));
-    EXPECT_CALL(*client(), didFinishLoading(_, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
-
-    startLoader(successURL());
-    callCheckpoint(2);
-    serveRequests();
-}
-
 TEST_P(ThreadableLoaderTest, DidFail)
 {
     InSequence s;