Have uses of MockImageResourceClient leak less.

Source/core/fetch/ImageResourceTest.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 30 matching lines @@
 #include "platform/SharedBuffer.h"
 #include "platform/exported/WrappedResourceResponse.h"
 #include "platform/graphics/Image.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 
+#include <gtest/gtest.h>
+
 namespace blink {
 
 static Vector<unsigned char> jpegImage()
 {
     Vector<unsigned char> jpeg;
 
     static const unsigned char data[] = {
         0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00,
         0x48, 0x00, 0x48, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
         0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0xff, 0xdb, 0x00, 0x43,
@@ skipping 26 matching lines @@
     ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);
     KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
     URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");
 
     // Emulate starting a real load, but don't expect any "real" WebURLLoaderClient callbacks.
     ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(testURL), nullptr);
     cachedImage->setIdentifier(createUniqueIdentifier());
     cachedImage->load(fetcher, ResourceLoaderOptions());
     Platform::current()->unitTestSupport()->unregisterMockedURL(testURL);
 
-    MockImageResourceClient client;
-    cachedImage->addClient(&client);
+    MockImageResourceClient client(cachedImage);
     EXPECT_EQ(Resource::Pending, cachedImage->status());
 
     // Send the multipart response. No image or data buffer is created.
     // Note that the response must be routed through ResourceLoader to
     // ensure the load is flagged as multipart.
     ResourceResponse multipartResponse(KURL(), "multipart/x-mixed-replace", 0, nullAtom, String());
     cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(multipartResponse), nullptr);
     ASSERT_FALSE(cachedImage->resourceBuffer());
     ASSERT_FALSE(cachedImage->hasImage());
     ASSERT_EQ(client.imageChangedCount(), 0);
@@ skipping 36 matching lines @@
 
     ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);
 
     // Emulate starting a real load.
     ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(testURL), nullptr);
     cachedImage->setIdentifier(createUniqueIdentifier());
 
     cachedImage->load(fetcher, ResourceLoaderOptions());
     memoryCache()->add(cachedImage.get());
 
-    MockImageResourceClient client;
-    cachedImage->addClient(&client);
+    MockImageResourceClient client(cachedImage);
     EXPECT_EQ(Resource::Pending, cachedImage->status());
 
     // The load should still be alive, but a timer should be started to cancel the load inside removeClient().
-    cachedImage->removeClient(&client);
+    client.removeAsClient();
     EXPECT_EQ(Resource::Pending, cachedImage->status());
     EXPECT_NE(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(testURL));
 
     // Trigger the cancel timer, ensure the load was cancelled and the resource was evicted from the cache.
     blink::testing::runPendingTasks();
     EXPECT_EQ(Resource::LoadError, cachedImage->status());
     EXPECT_EQ(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(testURL));
 
     Platform::current()->unitTestSupport()->unregisterMockedURL(testURL);
 }
 
 TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients)
 {
     ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(), nullptr);
     cachedImage->setLoading(true);
 
-    MockImageResourceClient client;
-    cachedImage->addClient(&client);
+    MockImageResourceClient client(cachedImage);
 
     // Send the image response.
     cachedImage->responseReceived(ResourceResponse(KURL(), "multipart/x-mixed-replace", 0, nullAtom, String()), nullptr);
 
     Vector<unsigned char> jpeg = jpegImage();
     cachedImage->responseReceived(ResourceResponse(KURL(), "image/jpeg", jpeg.size(), nullAtom, String()), nullptr);
     cachedImage->appendData(reinterpret_cast<const char*>(jpeg.data()), jpeg.size());
     cachedImage->finish();
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->image()->isNull());
     ASSERT_TRUE(client.notifyFinishedCalled());
 
     // The prune comes when the ImageResource still has clients. The image should not be deleted.
     cachedImage->prune();
     ASSERT_TRUE(cachedImage->hasClients());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->image()->isNull());
 
     // The ImageResource no longer has clients. The image should be deleted by prune.
-    cachedImage->removeClient(&client);
+    client.removeAsClient();
     cachedImage->prune();
     ASSERT_FALSE(cachedImage->hasClients());
     ASSERT_FALSE(cachedImage->hasImage());
     ASSERT_TRUE(cachedImage->image()->isNull());
 }
 
 TEST(ImageResourceTest, UpdateBitmapImages)
 {
     ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(), nullptr);
     cachedImage->setLoading(true);
 
-    MockImageResourceClient client;
-    cachedImage->addClient(&client);
+    MockImageResourceClient client(cachedImage);
 
     // Send the image response.
     Vector<unsigned char> jpeg = jpegImage();
     cachedImage->responseReceived(ResourceResponse(KURL(), "image/jpeg", jpeg.size(), nullAtom, String()), nullptr);
     cachedImage->appendData(reinterpret_cast<const char*>(jpeg.data()), jpeg.size());
     cachedImage->finish();
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->image()->isNull());
     ASSERT_EQ(client.imageChangedCount(), 2);
     ASSERT_TRUE(client.notifyFinishedCalled());
 
     HashSet<ImageResource*> bitmapImages;
     ASSERT_TRUE(cachedImage->image()->isBitmapImage());
     bitmapImages.add(cachedImage.get());
 }
 
 } // namespace blink