Unify Resource loading status tracking

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

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 eda945112f0aba9406a2d62488b91c78ada3d630..2043e24d233d1b1a579c7fc3a783f7cd7ef0d7b1 100644
--- a/third_party/WebKit/Source/core/fetch/CachingCorrectnessTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/CachingCorrectnessTest.cpp
@@ -91,6 +91,7 @@ protected:
             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;
@@ -103,6 +104,7 @@ protected:
         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;
@@ -392,6 +394,7 @@ TEST_F(CachingCorrectnessTest, FreshWithFreshRedirect)
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
@@ -426,6 +429,7 @@ TEST_F(CachingCorrectnessTest, FreshWithStaleRedirect)
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
@@ -439,7 +443,7 @@ 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));
@@ -478,6 +482,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectNotImplicitlyFresh)
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
@@ -513,6 +518,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshMaxAge)
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
@@ -548,6 +554,7 @@ TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshExpires)
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
+    firstResource->finish();
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);