Clear Resource::m_loader in Resource::finish() and Resource::error()

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

 /*
  * Copyright (c) 2013, 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 197 matching lines @@
     ASSERT_TRUE(resource->hasVaryHeader());
 
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
     EXPECT_EQ(resource, newResource);
 
     memoryCache()->remove(newResource);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
-TEST_F(ResourceFetcherTest, RevalidateWhileLoading)
+class RequestSameResourceOnComplete : public RawResourceClient {
+public:
+    RequestSameResourceOnComplete(Resource* resource)
+        : m_resource(resource)
+    {
+    }
+
+    void notifyFinished(Resource* resource) override
+    {
+        ASSERT_EQ(m_resource, resource);
+        ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchContext::create();
+        context->setCachePolicy(CachePolicyRevalidate);
+        ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
+        FetchRequest fetchRequest2(m_resource->url(), FetchInitiatorInfo());
+        Resource* resource2 = fetcher2->requestResource(fetchRequest2, TestResourceFactory(Resource::Image));
+        EXPECT_EQ(m_resource, resource2);
+    }
+    String debugName() const override { return "RequestSameResourceOnComplete"; }
+
+private:
+    Persistent<Resource> m_resource;
+};
+
+TEST_F(ResourceFetcherTest, RevalidateWhileFinishingLoading)

[Nate Chapin, 2016/04/27 19:48:30]

This is probably how this test should have been written from the beginning. It
was designed to test the special case that this patch removes from
ResourceFetcher::determineRevalidationPolicy, but it's still worthwhile to test
resource reuse during load completion.

 {
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
-    Platform::current()->getURLLoaderMockFactory()->registerURL(url, WebURLResponse(), "");
+    ResourceResponse response;
+    response.setURL(url);
+    response.setHTTPStatusCode(200);
+    response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
+    response.setHTTPHeaderField(HTTPNames::ETag, "1234567890");
+    Platform::current()->getURLLoaderMockFactory()->registerURL(url, WrappedResourceResponse(response), "");
 
     ResourceFetcher* fetcher1 = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     ResourceRequest request1(url);
     request1.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");
     FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo());
     Resource* resource1 = fetcher1->requestResource(fetchRequest1, TestResourceFactory(Resource::Image));
-    ResourceResponse response;
-    response.setURL(url);
-    response.setHTTPStatusCode(200);
-    response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
-    response.setHTTPHeaderField(HTTPNames::ETag, "1234567890");
-    resource1->responseReceived(response, nullptr);
-    resource1->finish();
-
-    ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchContext::create();
-    context->setCachePolicy(CachePolicyRevalidate);
-    ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
-    FetchRequest fetchRequest2(url, FetchInitiatorInfo());
-    Resource* resource2 = fetcher2->requestResource(fetchRequest2, TestResourceFactory(Resource::Image));
-    EXPECT_EQ(resource1, resource2);
-
-    // Tidily(?) shut down the ResourceLoader.
-    resource1->loader()->cancel();
+    RequestSameResourceOnComplete client(resource1);
+    resource1->addClient(&client);
+    Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
 TEST_F(ResourceFetcherTest, DontReuseMediaDataUrl)
 {
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     ResourceRequest request(KURL(ParsedURLString, "data:text/html,foo"));
     ResourceLoaderOptions options;
     options.dataBufferingPolicy = DoNotBufferData;
     FetchRequest fetchRequest = FetchRequest(request, FetchInitiatorTypeNames::internal, options);
@@ skipping 39 matching lines @@
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Raw));
     ServeRequestsOnCompleteClient client;
     resource->addClient(&client);
     resource->loader()->cancel();
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
 } // namespace blink