Reland "Allow cache reuse of some requests with Cache-Control headers"

Source/core/fetch/CachingCorrectnessTest.cpp

Index: Source/core/fetch/CachingCorrectnessTest.cpp
diff --git a/Source/core/fetch/CachingCorrectnessTest.cpp b/Source/core/fetch/CachingCorrectnessTest.cpp
index 593f10ab16d987daf3ee99755ec1f51a85331bea..d2e56f3de12702e5b4bc90ecfddda7a5bb65391f 100644
--- a/Source/core/fetch/CachingCorrectnessTest.cpp
+++ b/Source/core/fetch/CachingCorrectnessTest.cpp
@@ -76,6 +76,18 @@ protected:
         return resource;
     }
 
+    ResourcePtr<Resource> resourceFromResourceRequest(ResourceRequest request)
+    {
+        if (request.url().isNull())
+            request.setURL(KURL(ParsedURLString, kResourceURL));
+        ResourcePtr<Resource> resource =
+            new Resource(request, Resource::Raw);
+        resource->setResponse(ResourceResponse(KURL(ParsedURLString, kResourceURL), "text/html", 0, nullAtom, String()));
+        memoryCache()->add(resource.get());
+
+        return resource;
+    }
+
     ResourcePtr<Resource> fetch()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
@@ -271,6 +283,15 @@ TEST_F(CachingCorrectnessTest, FreshButNoCache)
     EXPECT_NE(fresh200Nocache, fetched);
 }
 
+TEST_F(CachingCorrectnessTest, RequestWithNoCahe)
+{
+    ResourceRequest noCacheRequest;
+    noCacheRequest.setHTTPHeaderField("Cache-Control", "no-cache");
+    ResourcePtr<Resource> noCacheResource = resourceFromResourceRequest(noCacheRequest);
+    ResourcePtr<Resource> fetched = fetch();
+    EXPECT_NE(noCacheResource, fetched);
+}
+
 TEST_F(CachingCorrectnessTest, FreshButNoStore)
 {
     ResourceResponse fresh200NostoreResponse;
@@ -288,6 +309,15 @@ TEST_F(CachingCorrectnessTest, FreshButNoStore)
     EXPECT_NE(fresh200Nostore, fetched);
 }
 
+TEST_F(CachingCorrectnessTest, RequestWithNoStore)
+{
+    ResourceRequest noStoreRequest;
+    noStoreRequest.setHTTPHeaderField("Cache-Control", "no-store");
+    ResourcePtr<Resource> noStoreResource = resourceFromResourceRequest(noStoreRequest);
+    ResourcePtr<Resource> fetched = fetch();
+    EXPECT_NE(noStoreResource, fetched);
+}
+
 // FIXME: Determine if ignoring must-revalidate for blink is correct behaviour.
 // See crbug.com/340088 .
 TEST_F(CachingCorrectnessTest, DISABLED_FreshButMustRevalidate)