Have uses of MockImageResourceClient leak less.

Source/core/fetch/MemoryCacheTest.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 107 matching lines @@
     ResourcePtr<FakeResource> cachedResource =
         new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
     cachedResource->fakeEncodedSize(resourceSize1);
 
     ASSERT_EQ(0u, memoryCache()->deadSize());
     ASSERT_EQ(0u, memoryCache()->liveSize());
     memoryCache()->add(cachedResource.get());
     ASSERT_EQ(cachedResource->size(), memoryCache()->deadSize());
     ASSERT_EQ(0u, memoryCache()->liveSize());
 
-    MockImageResourceClient client;
-    cachedResource->addClient(&client);
+    MockImageResourceClient client(cachedResource);
     ASSERT_EQ(0u, memoryCache()->deadSize());
     ASSERT_EQ(cachedResource->size(), memoryCache()->liveSize());
 
     cachedResource->fakeEncodedSize(resourceSize2);
     ASSERT_EQ(0u, memoryCache()->deadSize());
     ASSERT_EQ(cachedResource->size(), memoryCache()->liveSize());
-
-    cachedResource->removeClient(&client);
 }
 
 // Verifies that dead resources that exceed dead resource capacity are evicted
 // from cache when pruning.
 static void TestDeadResourceEviction(Resource* resource1, Resource* resource2)
 {
     memoryCache()->setDelayBeforeLiveDecodedPrune(0);
     memoryCache()->setMaxPruneDeferralDelay(0);
     const unsigned totalCapacity = 1000000;
     const unsigned minDeadCapacity = 0;
@@ skipping 46 matching lines @@
 
 static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, const ResourcePtr<Resource>& cachedLiveResource)
 {
     memoryCache()->setDelayBeforeLiveDecodedPrune(0);
     const unsigned totalCapacity = 1;
     const unsigned minDeadCapacity = 0;
     const unsigned maxDeadCapacity = 0;
     memoryCache()->setCapacities(minDeadCapacity, maxDeadCapacity, totalCapacity);
     const char data[6] = "abcde";
     cachedDeadResource->appendData(data, 3u);
-    MockImageResourceClient client;
-    cachedLiveResource->addClient(&client);
+    MockImageResourceClient client(cachedLiveResource);
     cachedLiveResource->appendData(data, 4u);
 
     class Task1 : public WebThread::Task {
     public:
         Task1(const ResourcePtr<Resource>& live, Resource* dead)
             : m_live(live)
             , m_dead(dead)
         { }
 
         void run() override
@@ skipping 37 matching lines @@
         }
 
     private:
         unsigned m_liveSizeWithoutDecode;
     };
 
 
     Platform::current()->currentThread()->postTask(FROM_HERE, new Task1(cachedLiveResource, cachedDeadResource));
     Platform::current()->currentThread()->postTask(FROM_HERE, new Task2(cachedLiveResource->encodedSize() + cachedLiveResource->overheadSize()));
     testing::runPendingTasks();
-    cachedLiveResource->removeClient(&client);
 }
 
 // Verified that when ordering a prune in a runLoop task, the prune
 // is deferred to the end of the task.
 TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_Basic)
 {
     Resource* cachedDeadResource =
         new Resource(ResourceRequest("hhtp://foo"), Resource::Raw);
     ResourcePtr<Resource> cachedLiveResource =
         new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
@@ skipping 30 matching lines @@
         TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
         memoryCache()->evictResources();
     }
 }
 
 // Verifies that cached resources are evicted immediately after release when
 // the total dead resource size is more than double the dead resource capacity.
 static void TestClientRemoval(const ResourcePtr<Resource>& resource1, const ResourcePtr<Resource>& resource2)
 {
     const char data[6] = "abcde";
-    MockImageResourceClient client1;
-    resource1->addClient(&client1);
+    MockImageResourceClient client1(resource1);
     resource1->appendData(data, 4u);
-    MockImageResourceClient client2;
-    resource2->addClient(&client2);
+    MockImageResourceClient client2(resource2);
     resource2->appendData(data, 4u);
 
     const unsigned minDeadCapacity = 0;
     const unsigned maxDeadCapacity = ((resource1->size() + resource2->size()) / 2) - 1;
     const unsigned totalCapacity = maxDeadCapacity;
     memoryCache()->setCapacities(minDeadCapacity, maxDeadCapacity, totalCapacity);
     memoryCache()->add(resource1.get());
     memoryCache()->add(resource2.get());
     // Call prune. There is nothing to prune, but this will initialize
     // the prune timestamp, allowing future prunes to be deferred.
     memoryCache()->prune();
     ASSERT_GT(resource1->decodedSize(), 0u);
     ASSERT_GT(resource2->decodedSize(), 0u);
     ASSERT_EQ(memoryCache()->deadSize(), 0u);
     ASSERT_EQ(memoryCache()->liveSize(), resource1->size() + resource2->size());
 
     // Removing the client from resource1 should result in all resources
     // remaining in cache since the prune is deferred.
-    resource1->removeClient(&client1);
+    client1.removeAsClient();
     ASSERT_GT(resource1->decodedSize(), 0u);
     ASSERT_GT(resource2->decodedSize(), 0u);
     ASSERT_EQ(memoryCache()->deadSize(), resource1->size());
     ASSERT_EQ(memoryCache()->liveSize(), resource2->size());
     ASSERT_TRUE(memoryCache()->contains(resource1.get()));
     ASSERT_TRUE(memoryCache()->contains(resource2.get()));
 
     // Removing the client from resource2 should result in immediate
     // eviction of resource2 because we are over the prune deferral limit.
-    resource2->removeClient(&client2);
+    client2.removeAsClient();
     ASSERT_GT(resource1->decodedSize(), 0u);
     ASSERT_GT(resource2->decodedSize(), 0u);
     ASSERT_EQ(memoryCache()->deadSize(), resource1->size());
     ASSERT_EQ(memoryCache()->liveSize(), 0u);
     ASSERT_TRUE(memoryCache()->contains(resource1.get()));
     ASSERT_FALSE(memoryCache()->contains(resource2.get()));
 }
 
 TEST_F(MemoryCacheTest, ClientRemoval_Basic)
 {
@@ skipping 36 matching lines @@
     }
 }
 
 // Verifies that CachedResources are evicted from the decode cache
 // according to their DecodeCachePriority.
 static void TestDecodeCacheOrder(const ResourcePtr<Resource>& cachedImageLowPriority, const ResourcePtr<Resource>& cachedImageHighPriority)
 {
     memoryCache()->setDelayBeforeLiveDecodedPrune(0);
     memoryCache()->setMaxPruneDeferralDelay(0);
 
-    MockImageResourceClient clientLowPriority;
-    MockImageResourceClient clientHighPriority;
-    cachedImageLowPriority->addClient(&clientLowPriority);
-    cachedImageHighPriority->addClient(&clientHighPriority);
+    MockImageResourceClient clientLowPriority(cachedImageLowPriority);
+    MockImageResourceClient clientHighPriority(cachedImageHighPriority);
 
     const char data[5] = "abcd";
     cachedImageLowPriority->appendData(data, 1u);
     cachedImageHighPriority->appendData(data, 4u);
     const unsigned lowPrioritySize = cachedImageLowPriority->size();
     const unsigned highPrioritySize = cachedImageHighPriority->size();
     const unsigned lowPriorityMockDecodeSize = cachedImageLowPriority->decodedSize();
     const unsigned highPriorityMockDecodeSize = cachedImageHighPriority->decodedSize();
     const unsigned totalSize = lowPrioritySize + highPrioritySize;
 
@@ skipping 29 matching lines @@
     memoryCache()->setCapacities(memoryCache()->minDeadCapacity(), memoryCache()->liveSize() - 10, memoryCache()->liveSize() - 10);
     memoryCache()->prune();
     ASSERT_EQ(memoryCache()->deadSize(), 0u);
     ASSERT_EQ(memoryCache()->liveSize(), totalSize - lowPriorityMockDecodeSize);
 
     // Should prune the HighPriority item.
     memoryCache()->setCapacities(memoryCache()->minDeadCapacity(), memoryCache()->liveSize() - 10, memoryCache()->liveSize() - 10);
     memoryCache()->prune();
     ASSERT_EQ(memoryCache()->deadSize(), 0u);
     ASSERT_EQ(memoryCache()->liveSize(), totalSize - lowPriorityMockDecodeSize - highPriorityMockDecodeSize);
-
-    cachedImageLowPriority->removeClient(&clientLowPriority);
-    cachedImageHighPriority->removeClient(&clientHighPriority);
 }
 
 TEST_F(MemoryCacheTest, DecodeCacheOrder_Basic)
 {
     ResourcePtr<FakeDecodedResource> cachedImageLowPriority =
         new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
     ResourcePtr<FakeDecodedResource> cachedImageHighPriority =
         new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
     TestDecodeCacheOrder(cachedImageLowPriority, cachedImageHighPriority);
 }
@@ skipping 103 matching lines @@
 
     WillBeHeapVector<RawPtrWillBeMember<Resource>> resources = memoryCache()->resourcesForURL(url);
     EXPECT_EQ(2u, resources.size());
 
     memoryCache()->evictResources();
     EXPECT_FALSE(memoryCache()->contains(resource1.get()));
     EXPECT_FALSE(memoryCache()->contains(resource3.get()));
 }
 
 } // namespace