third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp - Issue 2751143003: Move FrameFetchContext::dispatchDidLoadResourceFromMemoryCache logic into ResourceFetcher

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2751143003: Move FrameFetchContext::dispatchDidLoadResourceFromMemoryCache logic into ResourceFetcher (Closed)

Patch Set: addressed comments Created 3 years, 9 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

« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/platform/loader/fetch/FetchContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

index f55e46de1bc8e156184cf291981cdfc8847e7ba9..f781ccc93baa34eefb4efe4729618c21b92247d3 100644

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

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

@@ -720,6 +720,7 @@ TEST_F(FrameFetchContextTest, DisabledDataSaver) {

TEST_F(FrameFetchContextMockedLocalFrameClientTest,

DispatchDidLoadResourceFromMemoryCache) {

ResourceRequest resourceRequest(url);

+ resourceRequest.setRequestContext(WebURLRequest::RequestContextImage);

Resource* resource = MockResource::create(resourceRequest);

EXPECT_CALL(

*client,

@@ -731,8 +732,7 @@ TEST_F(FrameFetchContextMockedLocalFrameClientTest,

WebURLRequest::RequestContextImage)),

ResourceResponse()));

fetchContext->dispatchDidLoadResourceFromMemoryCache(

- createUniqueIdentifier(), resource, WebURLRequest::FrameTypeNone,

- WebURLRequest::RequestContextImage);

+ createUniqueIdentifier(), resourceRequest, resource->response());

}

// Tests that when a resource with certificate errors is loaded from the memory

@@ -740,6 +740,7 @@ TEST_F(FrameFetchContextMockedLocalFrameClientTest,

TEST_F(FrameFetchContextMockedLocalFrameClientTest,

MemoryCacheCertificateError) {

ResourceRequest resourceRequest(url);

+ resourceRequest.setRequestContext(WebURLRequest::RequestContextImage);

ResourceResponse response;

response.setURL(url);

response.setHasMajorCertificateErrors(true);

@@ -747,8 +748,7 @@ TEST_F(FrameFetchContextMockedLocalFrameClientTest,

resource->setResponse(response);

EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(url));

fetchContext->dispatchDidLoadResourceFromMemoryCache(

- createUniqueIdentifier(), resource, WebURLRequest::FrameTypeNone,

- WebURLRequest::RequestContextImage);

+ createUniqueIdentifier(), resourceRequest, resource->response());

}

TEST_F(FrameFetchContextTest, SetIsExternalRequestForPublicDocument) {