third_party/WebKit/Source/core/fetch/CachingCorrectnessTest.cpp - Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

Unified Diff: third_party/WebKit/Source/core/fetch/CachingCorrectnessTest.cpp

Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase + address review comments Created 4 years, 10 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/CSSStyleSheetResource.cpp ('k') | third_party/WebKit/Source/core/fetch/DocumentResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d90176ed0e61c4d7c064fd74f0ca7c16d1d166f2..5cdd7399a4d3b34552706fe171b2ebc7a491914c 100644

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

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

@@ -34,7 +34,6 @@

#include "core/fetch/RawResource.h"

#include "core/fetch/Resource.h"

#include "core/fetch/ResourceFetcher.h"

-#include "core/fetch/ResourcePtr.h"

#include "platform/network/ResourceRequest.h"

#include "platform/testing/TestingPlatformSupport.h"

#include "public/platform/Platform.h"

@@ -77,17 +76,17 @@ protected:

m_proxyPlatform.advanceClock(seconds);

}

- ResourcePtr<Resource> resourceFromResourceResponse(ResourceResponse response, Resource::Type type = Resource::Raw)

+ PassRefPtrWillBeRawPtr<Resource> resourceFromResourceResponse(ResourceResponse response, Resource::Type type = Resource::Raw)

{

if (response.url().isNull())

response.setURL(KURL(ParsedURLString, kResourceURL));

- ResourcePtr<Resource> resource;

+ RefPtrWillBeRawPtr<Resource> resource = nullptr;

switch (type) {

case Resource::Raw:

- resource = new Resource(ResourceRequest(response.url()), type);

+ resource = Resource::create(ResourceRequest(response.url()), type);

break;

case Resource::Image:

- resource = new ImageResource(ResourceRequest(response.url()), nullptr);

+ resource = ImageResource::create(ResourceRequest(response.url()), nullptr);

break;

default:

EXPECT_TRUE(false) << "'Unreachable' code was reached";

@@ -99,25 +98,25 @@ protected:

return resource;

}

- ResourcePtr<Resource> resourceFromResourceRequest(ResourceRequest request, Resource::Type type = Resource::Raw)

+ PassRefPtrWillBeRawPtr<Resource> resourceFromResourceRequest(ResourceRequest request, Resource::Type type = Resource::Raw)

{

if (request.url().isNull())

request.setURL(KURL(ParsedURLString, kResourceURL));

- ResourcePtr<Resource> resource =

- new Resource(request, type);

+ RefPtrWillBeRawPtr<Resource> resource =

+ Resource::create(request, type);

resource->setResponse(ResourceResponse(KURL(ParsedURLString, kResourceURL), "text/html", 0, nullAtom, String()));

memoryCache()->add(resource.get());

return resource;

}

- ResourcePtr<Resource> fetch()

+ PassRefPtrWillBeRawPtr<Resource> fetch()

{

FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());

return RawResource::fetchSynchronously(fetchRequest, fetcher());

}

- ResourcePtr<Resource> fetchImage()

+ PassRefPtrWillBeRawPtr<Resource> fetchImage()

{

FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());

return ImageResource::fetch(fetchRequest, fetcher());

@@ -175,12 +174,12 @@ TEST_F(CachingCorrectnessTest, FreshFromLastModified)

fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);

fresh200Response.setHTTPHeaderField("Last-Modified", kOneDayBeforeOriginalRequest);

- ResourcePtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);

+ RefPtrWillBeRawPtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);

// Advance the clock within the implicit freshness period of this resource before we make a request.

advanceClock(600.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_EQ(fresh200, fetched);

}

@@ -191,12 +190,12 @@ TEST_F(CachingCorrectnessTest, FreshFromExpires)

fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);

fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);

- ResourcePtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);

+ RefPtrWillBeRawPtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);

// Advance the clock within the freshness period of this resource before we make a request.

advanceClock(24. * 60. * 60. - 15.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_EQ(fresh200, fetched);

}

@@ -207,12 +206,12 @@ TEST_F(CachingCorrectnessTest, FreshFromMaxAge)

fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);

fresh200Response.setHTTPHeaderField("Cache-Control", "max-age=600");

- ResourcePtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);

+ RefPtrWillBeRawPtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);

// Advance the clock within the freshness period of this resource before we make a request.

advanceClock(500.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_EQ(fresh200, fetched);

}

@@ -224,12 +223,12 @@ TEST_F(CachingCorrectnessTest, DISABLED_ExpiredFromLastModified)

expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);

expired200Response.setHTTPHeaderField("Last-Modified", kOneDayBeforeOriginalRequest);

- ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);

+ RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);

// Advance the clock beyond the implicit freshness period.

advanceClock(24. * 60. * 60. * 0.2);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(expired200, fetched);

}

@@ -240,12 +239,12 @@ TEST_F(CachingCorrectnessTest, ExpiredFromExpires)

expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);

expired200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);

- ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);

+ RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);

// Advance the clock within the expiredness period of this resource before we make a request.

advanceClock(24. * 60. * 60. + 15.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(expired200, fetched);

}

@@ -257,12 +256,12 @@ TEST_F(CachingCorrectnessTest, NewImageExpiredFromExpires)

expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);

expired200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);

- ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response, Resource::Image);

+ RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response, Resource::Image);

// Advance the clock within the expiredness period of this resource before we make a request.

advanceClock(24. * 60. * 60. + 15.);

- ResourcePtr<Resource> fetched = fetchImage();

+ RefPtrWillBeRawPtr<Resource> fetched = fetchImage();

EXPECT_NE(expired200, fetched);

}

@@ -275,17 +274,17 @@ TEST_F(CachingCorrectnessTest, ReuseImageExpiredFromExpires)

expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);

expired200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);

- ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response, Resource::Image);

+ RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response, Resource::Image);

// Advance the clock within the freshness period, and make a request to add this image to the document resources.

advanceClock(15.);

- ResourcePtr<Resource> firstFetched = fetchImage();

+ RefPtrWillBeRawPtr<Resource> firstFetched = fetchImage();

EXPECT_EQ(expired200, firstFetched);

// Advance the clock within the expiredness period of this resource before we make a request.

advanceClock(24. * 60. * 60. + 15.);

- ResourcePtr<Resource> fetched = fetchImage();

+ RefPtrWillBeRawPtr<Resource> fetched = fetchImage();

EXPECT_EQ(expired200, fetched);

}

@@ -296,12 +295,12 @@ TEST_F(CachingCorrectnessTest, ExpiredFromMaxAge)

expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);

expired200Response.setHTTPHeaderField("Cache-Control", "max-age=600");

- ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);

+ RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);

// Advance the clock within the expiredness period of this resource before we make a request.

advanceClock(700.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(expired200, fetched);

}

@@ -313,12 +312,12 @@ TEST_F(CachingCorrectnessTest, FreshButNoCache)

fresh200NocacheResponse.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);

fresh200NocacheResponse.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");

- ResourcePtr<Resource> fresh200Nocache = resourceFromResourceResponse(fresh200NocacheResponse);

+ RefPtrWillBeRawPtr<Resource> fresh200Nocache = resourceFromResourceResponse(fresh200NocacheResponse);

// Advance the clock within the freshness period of this resource before we make a request.

advanceClock(24. * 60. * 60. - 15.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(fresh200Nocache, fetched);

}

@@ -326,8 +325,8 @@ TEST_F(CachingCorrectnessTest, RequestWithNoCahe)

{

ResourceRequest noCacheRequest;

noCacheRequest.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");

- ResourcePtr<Resource> noCacheResource = resourceFromResourceRequest(noCacheRequest);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> noCacheResource = resourceFromResourceRequest(noCacheRequest);

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(noCacheResource, fetched);

}

@@ -339,12 +338,12 @@ TEST_F(CachingCorrectnessTest, FreshButNoStore)

fresh200NostoreResponse.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);

fresh200NostoreResponse.setHTTPHeaderField(HTTPNames::Cache_Control, "no-store");

- ResourcePtr<Resource> fresh200Nostore = resourceFromResourceResponse(fresh200NostoreResponse);

+ RefPtrWillBeRawPtr<Resource> fresh200Nostore = resourceFromResourceResponse(fresh200NostoreResponse);

// Advance the clock within the freshness period of this resource before we make a request.

advanceClock(24. * 60. * 60. - 15.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(fresh200Nostore, fetched);

}

@@ -352,8 +351,8 @@ TEST_F(CachingCorrectnessTest, RequestWithNoStore)

{

ResourceRequest noStoreRequest;

noStoreRequest.setHTTPHeaderField(HTTPNames::Cache_Control, "no-store");

- ResourcePtr<Resource> noStoreResource = resourceFromResourceRequest(noStoreRequest);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> noStoreResource = resourceFromResourceRequest(noStoreRequest);

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(noStoreResource, fetched);

}

@@ -367,12 +366,12 @@ TEST_F(CachingCorrectnessTest, DISABLED_FreshButMustRevalidate)

fresh200MustRevalidateResponse.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);

fresh200MustRevalidateResponse.setHTTPHeaderField(HTTPNames::Cache_Control, "must-revalidate");

- ResourcePtr<Resource> fresh200MustRevalidate = resourceFromResourceResponse(fresh200MustRevalidateResponse);

+ RefPtrWillBeRawPtr<Resource> fresh200MustRevalidate = resourceFromResourceResponse(fresh200MustRevalidateResponse);

// Advance the clock within the freshness period of this resource before we make a request.

advanceClock(24. * 60. * 60. - 15.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(fresh200MustRevalidate, fetched);

}

@@ -382,7 +381,7 @@ TEST_F(CachingCorrectnessTest, FreshWithFreshRedirect)

const char redirectTargetUrlString[] = "http://redirect-target.com";

KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);

- ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);

+ RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);

ResourceResponse fresh301Response;

fresh301Response.setURL(redirectUrl);

@@ -407,7 +406,7 @@ TEST_F(CachingCorrectnessTest, FreshWithFreshRedirect)

advanceClock(500.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_EQ(firstResource, fetched);

}

@@ -417,7 +416,7 @@ TEST_F(CachingCorrectnessTest, FreshWithStaleRedirect)

const char redirectTargetUrlString[] = "http://redirect-target.com";

KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);

- ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);

+ RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);

ResourceResponse stale301Response;

stale301Response.setURL(redirectUrl);

@@ -441,7 +440,7 @@ TEST_F(CachingCorrectnessTest, FreshWithStaleRedirect)

advanceClock(500.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(firstResource, fetched);

}

@@ -449,14 +448,14 @@ TEST_F(CachingCorrectnessTest, PostToSameURLTwice)

{

ResourceRequest request1(KURL(ParsedURLString, kResourceURL));

request1.setHTTPMethod(HTTPNames::POST);

- ResourcePtr<Resource> resource1 = new Resource(ResourceRequest(request1.url()), Resource::Raw);

+ RefPtrWillBeRawPtr<Resource> resource1 = Resource::create(ResourceRequest(request1.url()), Resource::Raw);

resource1->setLoading(true);

memoryCache()->add(resource1.get());

ResourceRequest request2(KURL(ParsedURLString, kResourceURL));

request2.setHTTPMethod(HTTPNames::POST);

FetchRequest fetch2(request2, FetchInitiatorInfo());

- ResourcePtr<Resource> resource2 = RawResource::fetchSynchronously(fetch2, fetcher());

+ RefPtrWillBeRawPtr<Resource> resource2 = RawResource::fetchSynchronously(fetch2, fetcher());

EXPECT_EQ(resource2, memoryCache()->resourceForURL(request2.url()));

EXPECT_NE(resource1, resource2);

@@ -468,7 +467,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectNotImplicitlyFresh)

const char redirectTargetUrlString[] = "http://redirect-target.com";

KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);

- ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);

+ RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);

ResourceResponse fresh302Response;

fresh302Response.setURL(redirectUrl);

@@ -493,7 +492,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectNotImplicitlyFresh)

advanceClock(500.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_NE(firstResource, fetched);

}

@@ -503,7 +502,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshMaxAge)

const char redirectTargetUrlString[] = "http://redirect-target.com";

KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);

- ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);

+ RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);

ResourceResponse fresh302Response;

fresh302Response.setURL(redirectUrl);

@@ -528,7 +527,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshMaxAge)

advanceClock(500.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_EQ(firstResource, fetched);

}

@@ -538,7 +537,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshExpires)

const char redirectTargetUrlString[] = "http://redirect-target.com";

KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);

- ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);

+ RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);

ResourceResponse fresh302Response;

fresh302Response.setURL(redirectUrl);

@@ -563,7 +562,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshExpires)

advanceClock(500.);

- ResourcePtr<Resource> fetched = fetch();

+ RefPtrWillBeRawPtr<Resource> fetched = fetch();

EXPECT_EQ(firstResource, fetched);

}