Oilpan: Remove most WillBe types from the code base

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 26 matching lines @@
 #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:
-        static RefPtrWillBeRawPtr<FakeDecodedResource> create(const ResourceRequest& request, Type type)
+        static RawPtr<FakeDecodedResource> create(const ResourceRequest& request, Type type)
         {
-            return adoptRefWillBeNoop(new FakeDecodedResource(request, type));
+            return (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:
-        static RefPtrWillBeRawPtr<FakeResource> create(const ResourceRequest& request, Type type)
+        static RawPtr<FakeResource> create(const ResourceRequest& request, Type type)
         {
-            return adoptRefWillBeNoop(new FakeResource(request, type));
+            return (new FakeResource(request, type));
         }
 
         void fakeEncodedSize(size_t size)
         {
             setEncodedSize(size);
         }
 
     private:
         FakeResource(const ResourceRequest& request, Type type)
             : Resource(request, type)
@@ skipping 31 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);
-    RefPtrWillBeRawPtr<FakeResource> cachedResource =
+    RawPtr<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);
@@ skipping 36 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)
 {
-    RefPtrWillBeRawPtr<Resource> resource1 =
+    RawPtr<Resource> resource1 =
         Resource::create(ResourceRequest("http://test/resource1"), Resource::Raw);
-    RefPtrWillBeRawPtr<Resource> resource2 =
+    RawPtr<Resource> resource2 =
         Resource::create(ResourceRequest("http://test/resource2"), Resource::Raw);
     TestDeadResourceEviction(resource1.get(), resource2.get());
 }
 
 TEST_F(MemoryCacheTest, DeadResourceEviction_MultipleResourceMaps)
 {
-    RefPtrWillBeRawPtr<Resource> resource1 =
+    RawPtr<Resource> resource1 =
         Resource::create(ResourceRequest("http://test/resource1"), Resource::Raw);
-    RefPtrWillBeRawPtr<Resource> resource2 =
+    RawPtr<Resource> resource2 =
         Resource::create(ResourceRequest("http://test/resource2"), Resource::Raw);
     resource2->setCacheIdentifier("foo");
     TestDeadResourceEviction(resource1.get(), resource2.get());
 }
 
 static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, Resource* cachedLiveResource)
 {
     memoryCache()->setDelayBeforeLiveDecodedPrune(0);
     const unsigned totalCapacity = 1;
     const unsigned minDeadCapacity = 0;
@@ skipping 28 matching lines @@
             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:
-        RefPtrWillBePersistent<Resource> m_live;
-        RefPtrWillBePersistent<Resource> m_dead;
+        Persistent<Resource> m_live;
+        Persistent<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)
 {
-    RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+    RawPtr<Resource> cachedDeadResource =
         Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
-    RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+    RawPtr<Resource> cachedLiveResource =
         FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
 }
 
 TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_MultipleResourceMaps)
 {
     {
-        RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+        RawPtr<Resource> cachedDeadResource =
             Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
         cachedDeadResource->setCacheIdentifier("foo");
-        RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+        RawPtr<Resource> cachedLiveResource =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
         memoryCache()->evictResources();
     }
     {
-        RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+        RawPtr<Resource> cachedDeadResource =
             Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
-        RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+        RawPtr<Resource> cachedLiveResource =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedLiveResource->setCacheIdentifier("foo");
         TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
         memoryCache()->evictResources();
     }
     {
-        RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+        RawPtr<Resource> cachedDeadResource =
             Resource::create(ResourceRequest("hhtp://test/resource"), Resource::Raw);
         cachedDeadResource->setCacheIdentifier("foo");
-        RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+        RawPtr<Resource> cachedLiveResource =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedLiveResource->setCacheIdentifier("bar");
         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(Resource* resource1, Resource* resource2)
@@ skipping 34 matching lines @@
     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));
     ASSERT_FALSE(memoryCache()->contains(resource2));
 }
 
 TEST_F(MemoryCacheTest, ClientRemoval_Basic)
 {
-    RefPtrWillBeRawPtr<Resource> resource1 =
+    RawPtr<Resource> resource1 =
         FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
-    RefPtrWillBeRawPtr<Resource> resource2 =
+    RawPtr<Resource> resource2 =
         FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     TestClientRemoval(resource1.get(), resource2.get());
 }
 
 TEST_F(MemoryCacheTest, ClientRemoval_MultipleResourceMaps)
 {
     {
-        RefPtrWillBeRawPtr<Resource> resource1 =
+        RawPtr<Resource> resource1 =
             FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
         resource1->setCacheIdentifier("foo");
-        RefPtrWillBeRawPtr<Resource> resource2 =
+        RawPtr<Resource> resource2 =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         TestClientRemoval(resource1.get(), resource2.get());
         memoryCache()->evictResources();
     }
     {
-        RefPtrWillBeRawPtr<Resource> resource1 =
+        RawPtr<Resource> resource1 =
             FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
-        RefPtrWillBeRawPtr<Resource> resource2 =
+        RawPtr<Resource> resource2 =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         resource2->setCacheIdentifier("foo");
         TestClientRemoval(resource1.get(), resource2.get());
         memoryCache()->evictResources();
     }
     {
-        RefPtrWillBeRawPtr<Resource> resource1 =
+        RawPtr<Resource> resource1 =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         resource1->setCacheIdentifier("foo");
-        RefPtrWillBeRawPtr<Resource> resource2 =
+        RawPtr<Resource> resource2 =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         resource2->setCacheIdentifier("bar");
         TestClientRemoval(resource1.get(), resource2.get());
         memoryCache()->evictResources();
     }
 }
 
 // Verifies that CachedResources are evicted from the decode cache
 // according to their DecodeCachePriority.
 static void TestDecodeCacheOrder(Resource* cachedImageLowPriority, Resource* cachedImageHighPriority)
@@ skipping 49 matching lines @@
 
     // 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)
 {
-    RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+    RawPtr<FakeDecodedResource> cachedImageLowPriority =
         FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
-    RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+    RawPtr<FakeDecodedResource> cachedImageHighPriority =
         FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
 }
 
 TEST_F(MemoryCacheTest, DecodeCacheOrder_MultipleResourceMaps)
 {
     {
-        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+        RawPtr<FakeDecodedResource> cachedImageLowPriority =
             FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
-        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+        RawPtr<FakeDecodedResource> cachedImageHighPriority =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedImageLowPriority->setCacheIdentifier("foo");
         TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
         memoryCache()->evictResources();
     }
     {
-        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+        RawPtr<FakeDecodedResource> cachedImageLowPriority =
             FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
-        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+        RawPtr<FakeDecodedResource> cachedImageHighPriority =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedImageHighPriority->setCacheIdentifier("foo");
         TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
         memoryCache()->evictResources();
     }
     {
-        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+        RawPtr<FakeDecodedResource> cachedImageLowPriority =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedImageLowPriority->setCacheIdentifier("foo");
-        RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+        RawPtr<FakeDecodedResource> cachedImageHighPriority =
             FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
         cachedImageHighPriority->setCacheIdentifier("bar");
         TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
         memoryCache()->evictResources();
     }
 }
 
 TEST_F(MemoryCacheTest, RemoveDuringRevalidation)
 {
-    RefPtrWillBeRawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    RawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     memoryCache()->add(resource1.get());
 
-    RefPtrWillBeRawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    RawPtr<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()));
 
-    RefPtrWillBeRawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    RawPtr<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)
 {
-    RefPtrWillBeRawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    RawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
     memoryCache()->add(resource1.get());
 
-    RefPtrWillBeRawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    RawPtr<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()));
 
-    RefPtrWillBeRawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+    RawPtr<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);
+    HeapVector<Member<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