Move ThreadableLoaderClientWrapper to Oilpan heap

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 529 matching lines @@
 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.
-    if (GetParam() == DocumentThreadableLoaderTest)
-        EXPECT_CALL(*client(), didReceiveResourceTiming(_));
+    EXPECT_CALL(*client(), didReceiveResourceTiming(_));
     EXPECT_CALL(*client(), didFinishLoading(_, _));
 
     startLoader(successURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, CancelInDidFinishLoading)
 {
     InSequence s;
     EXPECT_CALL(checkpoint(), Call(1));
     createLoader();
     callCheckpoint(1);
 
     EXPECT_CALL(checkpoint(), Call(2));
     EXPECT_CALL(*client(), didReceiveResponseMock(_, _, _));
     EXPECT_CALL(*client(), didReceiveData(_, _));
-    if (GetParam() == DocumentThreadableLoaderTest)
-        EXPECT_CALL(*client(), didReceiveResourceTiming(_));
+    EXPECT_CALL(*client(), didReceiveResourceTiming(_));
     EXPECT_CALL(*client(), didFinishLoading(_, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::cancelLoader));
 
     startLoader(successURL());
     callCheckpoint(2);
     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(_, _));
-    if (GetParam() == DocumentThreadableLoaderTest)
-        EXPECT_CALL(*client(), didReceiveResourceTiming(_));
+    EXPECT_CALL(*client(), didReceiveResourceTiming(_));
     EXPECT_CALL(*client(), didFinishLoading(_, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
 
     startLoader(successURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, DidFail)
 {
     InSequence s;
@@ skipping 135 matching lines @@
 TEST_P(ThreadableLoaderTest, RedirectDidFinishLoading)
 {
     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));
-    if (GetParam() == DocumentThreadableLoaderTest)
-        EXPECT_CALL(*client(), didReceiveResourceTiming(_));
+    EXPECT_CALL(*client(), didReceiveResourceTiming(_));
     EXPECT_CALL(*client(), didFinishLoading(_, _));
 
     startLoader(redirectURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, CancelInRedirectDidFinishLoading)
 {
     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));
-    if (GetParam() == DocumentThreadableLoaderTest)
-        EXPECT_CALL(*client(), didReceiveResourceTiming(_));
+    EXPECT_CALL(*client(), didReceiveResourceTiming(_));
     EXPECT_CALL(*client(), didFinishLoading(_, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::cancelLoader));
 
     startLoader(redirectURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, ClearInRedirectDidFinishLoading)
 {
     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));
-    if (GetParam() == DocumentThreadableLoaderTest)
-        EXPECT_CALL(*client(), didReceiveResourceTiming(_));
+    EXPECT_CALL(*client(), didReceiveResourceTiming(_));
     EXPECT_CALL(*client(), didFinishLoading(_, _)).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
 
     startLoader(redirectURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 TEST_P(ThreadableLoaderTest, DidFailRedirectCheck)
 {
     InSequence s;
@@ skipping 35 matching lines @@
     EXPECT_CALL(*client(), didFailRedirectCheck()).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
 
     startLoader(redirectLoopURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 } // namespace
 
 } // namespace blink