Allow cache reuse of some requests with Cache-Control headers

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 58 matching lines @@
         if (response.url().isNull())
             response.setURL(KURL(ParsedURLString, kResourceURL));
         ResourcePtr<Resource> resource =
             new Resource(ResourceRequest(response.url()), Resource::Raw);
         resource->setResponse(response);
         memoryCache()->add(resource.get());
 
         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());
         return m_fetcher->fetchSynchronously(fetchRequest);
     }
 
 private:
     // A simple platform that mocks out the clock, for cache freshness testing.
     class ProxyPlatform : public blink::Platform {
     public:
@@ skipping 173 matching lines @@
 
     ResourcePtr<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();
     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;
     fresh200NostoreResponse.setHTTPStatusCode(200);
     fresh200NostoreResponse.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     fresh200NostoreResponse.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
     fresh200NostoreResponse.setHTTPHeaderField("Cache-Control", "no-store");
 
     ResourcePtr<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();
     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)
 {
     ResourceResponse fresh200MustRevalidateResponse;
     fresh200MustRevalidateResponse.setHTTPStatusCode(200);
     fresh200MustRevalidateResponse.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     fresh200MustRevalidateResponse.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
     fresh200MustRevalidateResponse.setHTTPHeaderField("Cache-Control", "must-revalidate");
 
@@ skipping 69 matching lines @@
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     ResourcePtr<Resource> fetched = fetch();
     EXPECT_NE(firstResource, fetched);
 }
 
 } // namespace