third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp - Issue 2395313002: Revert of Make ResourceFetcher return Resources with LoadError instead of nullptrs.

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/fetch/ResourceFetcherTest.cpp

Issue 2395313002: Revert of Make ResourceFetcher return Resources with LoadError instead of nullptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 2 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/fetch/ResourceFetcher.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

index 3e10713829c05719d25c3e8e595bec0b4b00e76f..a785c7199be3cf54e960410010dd57ed0d37157d 100644

--- a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

@@ -126,16 +126,14 @@

TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach) {

KURL secureURL(ParsedURLString, "https://secureorigin.test/image.png");

- // Try to request a url. The request should fail, and a resource in an error

- // state should be returned, and no resource should be present in the cache.

+ // Try to request a url. The request should fail, no resource should be

+ // returned, and no resource should be present in the cache.

ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);

FetchRequest fetchRequest =

FetchRequest(ResourceRequest(secureURL), FetchInitiatorInfo());

Resource* resource =

fetcher->requestResource(fetchRequest, TestResourceFactory());

- ASSERT_TRUE(resource);

- EXPECT_TRUE(resource->errorOccurred());

- EXPECT_TRUE(resource->resourceError().isAccessCheck());

+ EXPECT_FALSE(resource);

EXPECT_FALSE(memoryCache()->resourceForURL(secureURL));

// Start by calling startLoad() directly, rather than via requestResource().