third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp - Issue 2146333002: Move ThreadableLoaderClientWrapper to Oilpan heap

Unified Diff: third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp

Issue 2146333002: Move ThreadableLoaderClientWrapper to Oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/loader/ThreadableLoaderClientWrapper.h ('K') | « third_party/WebKit/Source/core/loader/ThreadableLoaderClientWrapper.h ('k') | third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1ee913c9a8af0a068891da54bc8edbb04bda1d58..3bc1dec85de869dcfb76742ac8fc8ce8289b4b84 100644

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

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

@@ -547,11 +547,7 @@ TEST_P(ThreadableLoaderTest, DidFinishLoading)

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());

@@ -569,8 +565,7 @@ TEST_P(ThreadableLoaderTest, CancelInDidFinishLoading)

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());

@@ -588,8 +583,7 @@ TEST_P(ThreadableLoaderTest, ClearInDidFinishLoading)

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());

@@ -745,8 +739,7 @@ TEST_P(ThreadableLoaderTest, RedirectDidFinishLoading)

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());

@@ -764,8 +757,7 @@ TEST_P(ThreadableLoaderTest, CancelInRedirectDidFinishLoading)

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());

@@ -783,8 +775,7 @@ TEST_P(ThreadableLoaderTest, ClearInRedirectDidFinishLoading)

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());