Have uses of MockImageResourceClient leak less.

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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/fetch/ResourceFetcher.h"
 
 #include "core/fetch/FetchInitiatorInfo.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/MemoryCache.h"
+#include "core/fetch/ResourceLoader.h"
 #include "core/fetch/ResourcePtr.h"
 #include "platform/exported/WrappedResourceResponse.h"
 #include "platform/heap/Handle.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include <gtest/gtest.h>
@@ skipping 63 matching lines @@
     response.setHTTPHeaderField("Cache-Control", "max-age=3600");
     resource->responseReceived(response, nullptr);
     resource->finish();
 
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     ResourcePtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
     EXPECT_EQ(resource, newResource);
     memoryCache()->remove(resource.get());
 }
 
-
 TEST_F(ResourceFetcherTest, Vary)
 {
-    ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
-
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     ResourcePtr<Resource> resource = new Resource(url, Resource::Raw);
     memoryCache()->add(resource.get());
     ResourceResponse response;
     response.setURL(url);
     response.setHTTPStatusCode(200);
     response.setHTTPHeaderField("Cache-Control", "max-age=3600");
     response.setHTTPHeaderField("Vary", "*");
     resource->responseReceived(response, nullptr);
     resource->finish();
     ASSERT_TRUE(resource->hasVaryHeader());
 
+    ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Platform::current()->unitTestSupport()->registerMockedURL(url, WebURLResponse(), "");
     ResourcePtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory());
     EXPECT_NE(resource, newResource);
-
+    newResource->loader()->cancel();
     memoryCache()->remove(newResource.get());
     Platform::current()->unitTestSupport()->unregisterMockedURL(url);
+
+    memoryCache()->remove(resource.get());
 }
 
 TEST_F(ResourceFetcherTest, VaryOnBack)
 {
     ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchContext::create();
     context->setCachePolicy(CachePolicyHistoryBuffer);
     ResourceFetcher* fetcher = ResourceFetcher::create(context);
 
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     ResourcePtr<Resource> resource = new Resource(url, Resource::Raw);
@@ skipping 57 matching lines @@
     response.setHTTPHeaderField("etag", "1234567890");
     resource1->responseReceived(response, nullptr);
     resource1->finish();
 
     ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchContext::create();
     context->setCachePolicy(CachePolicyRevalidate);
     ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
     FetchRequest fetchRequest2(url, FetchInitiatorInfo());
     ResourcePtr<Resource> resource2 = fetcher2->requestResource(fetchRequest2, TestResourceFactory(Resource::Image));
     EXPECT_EQ(resource1, resource2);
+
+    // Tidily(?) shut down the ResourceLoader.
+    resource1->loader()->cancel();
+    Platform::current()->unitTestSupport()->unregisterMockedURL(url);
 }
 
 } // namespace blink