Unify Resource loading status tracking

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

 /*
  * Copyright (c) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 73 matching lines @@
             resource = Resource::create(ResourceRequest(response.url()), type);
             break;
         case Resource::Image:
             resource = ImageResource::create(ResourceRequest(response.url()), nullptr);
             break;
         default:
             EXPECT_TRUE(false) << "'Unreachable' code was reached";
             return nullptr;
         }
         resource->setResponse(response);
+        resource->setStatus(Resource::Cached);

[hiroshige, 2016/03/18 23:21:20]

If setStatus(Cached) and finish() at Line 397 etc. are used for the same purpose
of make Resource loaded, can we call finish() here for consistency?

[Nate Chapin, 2016/03/21 22:04:01]

Added finish() call, but leaving setStatus() call in for type == Image with
explanatory comment.

[hiroshige, 2016/03/22 18:21:33]

Oh, OK. Please mention that this is a test-only hack in the comment.

[Nate Chapin, 2016/03/22 19:51:23]

Done.

         memoryCache()->add(resource.get());
 
         return resource;
     }
 
     PassRefPtrWillBeRawPtr<Resource> resourceFromResourceRequest(ResourceRequest request, Resource::Type type = Resource::Raw)
     {
         if (request.url().isNull())
             request.setURL(KURL(ParsedURLString, kResourceURL));
         RefPtrWillBeRawPtr<Resource> resource =
             Resource::create(request, type);
         resource->setResponse(ResourceResponse(KURL(ParsedURLString, kResourceURL), "text/html", 0, nullAtom, String()));
+        resource->setStatus(Resource::Cached);

[hiroshige, 2016/03/18 23:21:20]

ditto.

[Nate Chapin, 2016/03/21 22:04:01]

Done.

         memoryCache()->add(resource.get());
 
         return resource;
     }
 
     PassRefPtrWillBeRawPtr<Resource> fetch()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
         return RawResource::fetchSynchronously(fetchRequest, fetcher());
     }
@@ skipping 269 matching lines @@
     firstResource->willFollowRedirect(redirectRequest, fresh301Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, FreshWithStaleRedirect)
 {
@@ skipping 14 matching lines @@
     firstResource->willFollowRedirect(redirectRequest, stale301Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, PostToSameURLTwice)
 {
     ResourceRequest request1(KURL(ParsedURLString, kResourceURL));
     request1.setHTTPMethod(HTTPNames::POST);
     RefPtrWillBeRawPtr<Resource> resource1 = Resource::create(ResourceRequest(request1.url()), Resource::Raw);
-    resource1->setLoading(true);
+    resource1->setStatus(Resource::Pending);
     memoryCache()->add(resource1.get());
 
     ResourceRequest request2(KURL(ParsedURLString, kResourceURL));
     request2.setHTTPMethod(HTTPNames::POST);
     FetchRequest fetch2(request2, FetchInitiatorInfo());
     RefPtrWillBeRawPtr<Resource> resource2 = RawResource::fetchSynchronously(fetch2, fetcher());
 
     EXPECT_EQ(resource2, memoryCache()->resourceForURL(request2.url()));
     EXPECT_NE(resource1, resource2);
 }
@@ skipping 18 matching lines @@
     firstResource->willFollowRedirect(redirectRequest, fresh302Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshMaxAge)
 {
@@ skipping 15 matching lines @@
     firstResource->willFollowRedirect(redirectRequest, fresh302Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshExpires)
 {
@@ skipping 15 matching lines @@
     firstResource->willFollowRedirect(redirectRequest, fresh302Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 } // namespace blink