Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 "core/fetch/MemoryCache.h"
 
 #include "core/fetch/MockImageResourceClient.h"
 #include "core/fetch/RawResource.h"
-#include "core/fetch/ResourcePtr.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
 class MemoryCacheTest : public ::testing::Test {
 public:
     class FakeDecodedResource : public Resource {
     public:
-        FakeDecodedResource(const ResourceRequest& request, Type type)
-            : Resource(request, type)
+        static RefPtrWillBeRawPtr<FakeDecodedResource> create(const ResourceRequest& request, Type type)
         {
+            return adoptRefWillBeNoop(new FakeDecodedResource(request, type));
         }
 
         virtual void appendData(const char* data, size_t len)
         {
             Resource::appendData(data, len);
             setDecodedSize(this->size());
         }
 
     protected:
+        FakeDecodedResource(const ResourceRequest& request, Type type)
+            : Resource(request, type)
+        {
+        }
+
         void destroyDecodedDataIfPossible() override
         {
             setDecodedSize(0);
         }
     };
 
     class FakeResource : public Resource {
     public:
-        FakeResource(const ResourceRequest& request, Type type)
-            : Resource(request, type)
+        static RefPtrWillBeRawPtr<FakeResource> create(const ResourceRequest& request, Type type)
         {
+            return adoptRefWillBeNoop(new FakeResource(request, type));
         }
 
         void fakeEncodedSize(size_t size)
         {
             setEncodedSize(size);
         }
+
+    private:
+        FakeResource(const ResourceRequest& request, Type type)
+            : Resource(request, type)
+        {
+        }
     };
 
 protected:
     virtual void SetUp()
     {
         // Save the global memory cache to restore it upon teardown.
         m_globalMemoryCache = replaceMemoryCacheForTesting(MemoryCache::create());
     }
 
     virtual void TearDown()
@@ skipping 19 matching lines @@
 
 TEST_F(MemoryCacheTest, VeryLargeResourceAccounting)
 {
     const size_t sizeMax = ~static_cast<size_t>(0);
     const size_t totalCapacity = sizeMax / 4;
     const size_t minDeadCapacity = sizeMax / 16;
     const size_t maxDeadCapacity = sizeMax / 8;
     const size_t resourceSize1 = sizeMax / 16;
     const size_t resourceSize2 = sizeMax / 20;
     memoryCache()->setCapacities(minDeadCapacity, maxDeadCapacity, totalCapacity);
-    ResourcePtr<FakeResource> cachedResource =
-        new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+    RefPtrWillBeRawPtr<FakeResource> cachedResource =
+        FakeResource::create(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);
     ASSERT_EQ(0u, memoryCache()->deadSize());
@@ skipping 35 matching lines @@
     ASSERT_EQ(resource1->size() + resource2->size(), memoryCache()->deadSize());
     ASSERT_EQ(0u, memoryCache()->liveSize());
 
     memoryCache()->prune();
     ASSERT_EQ(0u, memoryCache()->deadSize());
     ASSERT_EQ(0u, memoryCache()->liveSize());
 }
 
 TEST_F(MemoryCacheTest, DeadResourceEviction_Basic)
 {
-    Resource* resource1 =
-        new Resource(ResourceRequest("http://test/resource1"), Resource::Raw);
-    Resource* resource2 =
-        new Resource(ResourceRequest("http://test/resource2"), Resource::Raw);
-    TestDeadResourceEviction(resource1, resource2);
+    RefPtrWillBeRawPtr<Resource> resource1 =
+        Resource::create(ResourceRequest("http://test/resource1"), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> resource2 =
+        Resource::create(ResourceRequest("http://test/resource2"), Resource::Raw);
+    TestDeadResourceEviction(resource1.get(), resource2.get());
 }
 
 TEST_F(MemoryCacheTest, DeadResourceEviction_MultipleResourceMaps)
 {
-    Resource* resource1 =
-        new Resource(ResourceRequest("http://test/resource1"), Resource::Raw);
-    Resource* resource2 =
-        new Resource(ResourceRequest("http://test/resource2"), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> resource1 =
+        Resource::create(ResourceRequest("http://test/resource1"), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> resource2 =
+        Resource::create(ResourceRequest("http://test/resource2"), Resource::Raw);
     resource2->setCacheIdentifier("foo");
-    TestDeadResourceEviction(resource1, resource2);
+    TestDeadResourceEviction(resource1.get(), resource2.get());
 }
 
-static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, const ResourcePtr<Resource>& cachedLiveResource)
+static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, 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);
     cachedLiveResource->appendData(data, 4u);
 
     class Task1 : public WebTaskRunner::Task {
     public:
-        Task1(const ResourcePtr<Resource>& live, Resource* dead)
+        Task1(Resource* live, Resource* dead)
             : m_live(live)
             , m_dead(dead)
         { }
 
         void run() override
         {
             // The resource size has to be nonzero for this test to be meaningful, but
             // we do not rely on it having any particular value.
             ASSERT_GT(m_live->size(), 0u);
             ASSERT_GT(m_dead->size(), 0u);
 
             ASSERT_EQ(0u, memoryCache()->deadSize());
             ASSERT_EQ(0u, memoryCache()->liveSize());
 
-            memoryCache()->add(m_dead);
+            memoryCache()->add(m_dead.get());
             memoryCache()->add(m_live.get());
             memoryCache()->updateDecodedResource(m_live.get(), UpdateForPropertyChange);
             ASSERT_EQ(m_dead->size(), memoryCache()->deadSize());
             ASSERT_EQ(m_live->size(), memoryCache()->liveSize());
             ASSERT_GT(m_live->decodedSize(), 0u);
 
             memoryCache()->prune(); // Dead resources are pruned immediately
             ASSERT_EQ(m_dead->size(), memoryCache()->deadSize());
             ASSERT_EQ(m_live->size(), memoryCache()->liveSize());
             ASSERT_GT(m_live->decodedSize(), 0u);
         }
 
     private:
-        ResourcePtr<Resource> m_live;
-        RawPtrWillBePersistent<Resource> m_dead;
+        RefPtrWillBePersistent<Resource> m_live;
+        RefPtrWillBePersistent<Resource> m_dead;
     };
 
     class Task2 : public WebTaskRunner::Task {
     public:
         Task2(unsigned liveSizeWithoutDecode)
             : m_liveSizeWithoutDecode(liveSizeWithoutDecode) { }
 
         void run() override
         {
             // Next task: now, the live resource was evicted.
             ASSERT_EQ(0u, memoryCache()->deadSize());
             ASSERT_EQ(m_liveSizeWithoutDecode, memoryCache()->liveSize());
         }
 
     private:
         unsigned m_liveSizeWithoutDecode;
     };
 
 
     Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, new Task1(cachedLiveResource, cachedDeadResource));
     Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, new Task2(cachedLiveResource->encodedSize() + cachedLiveResource->overheadSize()));
     testing::runPendingTasks();
 }
 
 // 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);
-    TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
+    RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+        Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+        FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
 }
 
 TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_MultipleResourceMaps)
 {
     {
-        Resource* cachedDeadResource =
-            new Resource(ResourceRequest("hhtp://foo"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+            Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
         cachedDeadResource->setCacheIdentifier("foo");
-        ResourcePtr<Resource> cachedLiveResource =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
-        TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
+        RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+        TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
         memoryCache()->evictResources();
     }
     {
-        Resource* cachedDeadResource =
-            new Resource(ResourceRequest("hhtp://foo"), Resource::Raw);
-        ResourcePtr<Resource> cachedLiveResource =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+            Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedLiveResource->setCacheIdentifier("foo");
-        TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
+        TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
         memoryCache()->evictResources();
     }
     {
-        Resource* cachedDeadResource =
-            new Resource(ResourceRequest("hhtp://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+            Resource::create(ResourceRequest("hhtp://test/resource"), Resource::Raw);
         cachedDeadResource->setCacheIdentifier("foo");
-        ResourcePtr<Resource> cachedLiveResource =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedLiveResource->setCacheIdentifier("bar");
-        TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
+        TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
         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)
+static void TestClientRemoval(Resource* resource1, Resource* resource2)
 {
     const char data[6] = "abcde";
     MockImageResourceClient client1(resource1);
     resource1->appendData(data, 4u);
     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());
+    memoryCache()->add(resource1);
+    memoryCache()->add(resource2);
     // 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.
     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()));
+    ASSERT_TRUE(memoryCache()->contains(resource1));
+    ASSERT_TRUE(memoryCache()->contains(resource2));
 
     // Removing the client from resource2 should result in immediate
     // eviction of resource2 because we are over the prune deferral limit.
     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()));
+    ASSERT_TRUE(memoryCache()->contains(resource1));
+    ASSERT_FALSE(memoryCache()->contains(resource2));
 }
 
 TEST_F(MemoryCacheTest, ClientRemoval_Basic)
 {
-    ResourcePtr<Resource> resource1 =
-        new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
-    ResourcePtr<Resource> resource2 =
-        new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
-    TestClientRemoval(resource1, resource2);
+    RefPtrWillBeRawPtr<Resource> resource1 =
+        FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> resource2 =
+        FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    TestClientRemoval(resource1.get(), resource2.get());
 }
 
 TEST_F(MemoryCacheTest, ClientRemoval_MultipleResourceMaps)
 {
     {
-        ResourcePtr<Resource> resource1 =
-            new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> resource1 =
+            FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
         resource1->setCacheIdentifier("foo");
-        ResourcePtr<Resource> resource2 =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
-        TestClientRemoval(resource1, resource2);
+        RefPtrWillBeRawPtr<Resource> resource2 =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+        TestClientRemoval(resource1.get(), resource2.get());
         memoryCache()->evictResources();
     }
     {
-        ResourcePtr<Resource> resource1 =
-            new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
-        ResourcePtr<Resource> resource2 =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> resource1 =
+            FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> resource2 =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         resource2->setCacheIdentifier("foo");
-        TestClientRemoval(resource1, resource2);
+        TestClientRemoval(resource1.get(), resource2.get());
         memoryCache()->evictResources();
     }
     {
-        ResourcePtr<Resource> resource1 =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> resource1 =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         resource1->setCacheIdentifier("foo");
-        ResourcePtr<Resource> resource2 =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<Resource> resource2 =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         resource2->setCacheIdentifier("bar");
-        TestClientRemoval(resource1, resource2);
+        TestClientRemoval(resource1.get(), resource2.get());
         memoryCache()->evictResources();
     }
 }
 
 // Verifies that CachedResources are evicted from the decode cache
 // according to their DecodeCachePriority.
-static void TestDecodeCacheOrder(const ResourcePtr<Resource>& cachedImageLowPriority, const ResourcePtr<Resource>& cachedImageHighPriority)
+static void TestDecodeCacheOrder(Resource* cachedImageLowPriority, Resource* cachedImageHighPriority)
 {
     memoryCache()->setDelayBeforeLiveDecodedPrune(0);
     memoryCache()->setMaxPruneDeferralDelay(0);
 
     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;
 
     // Verify that the sizes are different to ensure that we can test eviction order.
     ASSERT_GT(lowPrioritySize, 0u);
     ASSERT_NE(lowPrioritySize, highPrioritySize);
     ASSERT_GT(lowPriorityMockDecodeSize, 0u);
     ASSERT_NE(lowPriorityMockDecodeSize, highPriorityMockDecodeSize);
 
     ASSERT_EQ(memoryCache()->deadSize(), 0u);
     ASSERT_EQ(memoryCache()->liveSize(), 0u);
 
     // Add the items. The item added first would normally be evicted first.
-    memoryCache()->add(cachedImageHighPriority.get());
+    memoryCache()->add(cachedImageHighPriority);
     ASSERT_EQ(memoryCache()->deadSize(), 0u);
     ASSERT_EQ(memoryCache()->liveSize(), highPrioritySize);
 
-    memoryCache()->add(cachedImageLowPriority.get());
+    memoryCache()->add(cachedImageLowPriority);
     ASSERT_EQ(memoryCache()->deadSize(), 0u);
     ASSERT_EQ(memoryCache()->liveSize(), highPrioritySize + lowPrioritySize);
 
     // Insert all items in the decoded items list with the same priority
-    memoryCache()->updateDecodedResource(cachedImageHighPriority.get(), UpdateForPropertyChange);
-    memoryCache()->updateDecodedResource(cachedImageLowPriority.get(), UpdateForPropertyChange);
+    memoryCache()->updateDecodedResource(cachedImageHighPriority, UpdateForPropertyChange);
+    memoryCache()->updateDecodedResource(cachedImageLowPriority, UpdateForPropertyChange);
     ASSERT_EQ(memoryCache()->deadSize(), 0u);
     ASSERT_EQ(memoryCache()->liveSize(), totalSize);
 
     // Now we will assign their priority and make sure they are moved to the correct buckets.
-    memoryCache()->updateDecodedResource(cachedImageLowPriority.get(), UpdateForPropertyChange, MemoryCacheLiveResourcePriorityLow);
-    memoryCache()->updateDecodedResource(cachedImageHighPriority.get(), UpdateForPropertyChange, MemoryCacheLiveResourcePriorityHigh);
+    memoryCache()->updateDecodedResource(cachedImageLowPriority, UpdateForPropertyChange, MemoryCacheLiveResourcePriorityLow);
+    memoryCache()->updateDecodedResource(cachedImageHighPriority, UpdateForPropertyChange, MemoryCacheLiveResourcePriorityHigh);
 
     // Should first prune the LowPriority item.
     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);
 }
 
 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);
+    RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+        FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+    RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+        FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
 }
 
 TEST_F(MemoryCacheTest, DecodeCacheOrder_MultipleResourceMaps)
 {
     {
-        ResourcePtr<FakeDecodedResource> cachedImageLowPriority =
-            new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
-        ResourcePtr<FakeDecodedResource> cachedImageHighPriority =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+            FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedImageLowPriority->setCacheIdentifier("foo");
-        TestDecodeCacheOrder(cachedImageLowPriority, cachedImageHighPriority);
+        TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
         memoryCache()->evictResources();
     }
     {
-        ResourcePtr<FakeDecodedResource> cachedImageLowPriority =
-            new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
-        ResourcePtr<FakeDecodedResource> cachedImageHighPriority =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+            FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedImageHighPriority->setCacheIdentifier("foo");
-        TestDecodeCacheOrder(cachedImageLowPriority, cachedImageHighPriority);
+        TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
         memoryCache()->evictResources();
     }
     {
-        ResourcePtr<FakeDecodedResource> cachedImageLowPriority =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedImageLowPriority->setCacheIdentifier("foo");
-        ResourcePtr<FakeDecodedResource> cachedImageHighPriority =
-            new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+            FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedImageHighPriority->setCacheIdentifier("bar");
-        TestDecodeCacheOrder(cachedImageLowPriority, cachedImageHighPriority);
+        TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
         memoryCache()->evictResources();
     }
 }
 
 TEST_F(MemoryCacheTest, RemoveDuringRevalidation)
 {
-    ResourcePtr<FakeResource> resource1 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+    RefPtrWillBeRawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     memoryCache()->add(resource1.get());
 
-    ResourcePtr<FakeResource> resource2 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+    RefPtrWillBeRawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     memoryCache()->remove(resource1.get());
     memoryCache()->add(resource2.get());
     EXPECT_TRUE(memoryCache()->contains(resource2.get()));
     EXPECT_FALSE(memoryCache()->contains(resource1.get()));
 
-    ResourcePtr<FakeResource> resource3 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+    RefPtrWillBeRawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     memoryCache()->remove(resource2.get());
     memoryCache()->add(resource3.get());
     EXPECT_TRUE(memoryCache()->contains(resource3.get()));
     EXPECT_FALSE(memoryCache()->contains(resource2.get()));
 }
 
 TEST_F(MemoryCacheTest, ResourceMapIsolation)
 {
-    ResourcePtr<FakeResource> resource1 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+    RefPtrWillBeRawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     memoryCache()->add(resource1.get());
 
-    ResourcePtr<FakeResource> resource2 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+    RefPtrWillBeRawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     resource2->setCacheIdentifier("foo");
     memoryCache()->add(resource2.get());
     EXPECT_TRUE(memoryCache()->contains(resource1.get()));
     EXPECT_TRUE(memoryCache()->contains(resource2.get()));
 
     const KURL url = KURL(ParsedURLString, "http://test/resource");
     EXPECT_EQ(resource1.get(), memoryCache()->resourceForURL(url));
     EXPECT_EQ(resource1.get(), memoryCache()->resourceForURL(url, memoryCache()->defaultCacheIdentifier()));
     EXPECT_EQ(resource2.get(), memoryCache()->resourceForURL(url, "foo"));
     EXPECT_EQ(0, memoryCache()->resourceForURL(KURL()));
 
-    ResourcePtr<FakeResource> resource3 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+    RefPtrWillBeRawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     resource3->setCacheIdentifier("foo");
     memoryCache()->remove(resource2.get());
     memoryCache()->add(resource3.get());
     EXPECT_TRUE(memoryCache()->contains(resource1.get()));
     EXPECT_FALSE(memoryCache()->contains(resource2.get()));
     EXPECT_TRUE(memoryCache()->contains(resource3.get()));
 
     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 blink