Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

Index: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
index 8f51fa4114f6a4ebe2efd46fb9b950b3e5add4e4..18ff9f39184dfeca465e96ef5f6127951362ffe2 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
@@ -49,9 +49,9 @@ namespace blink {
 
 class StubFrameLoaderClientWithParent final : public EmptyFrameLoaderClient {
 public:
-    static PassOwnPtrWillBeRawPtr<StubFrameLoaderClientWithParent> create(Frame* parent)
+    static RawPtr<StubFrameLoaderClientWithParent> create(Frame* parent)
     {
-        return adoptPtrWillBeNoop(new StubFrameLoaderClientWithParent(parent));
+        return (new StubFrameLoaderClientWithParent(parent));
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
@@ -68,15 +68,15 @@ private:
     {
     }
 
-    RawPtrWillBeMember<Frame> m_parent;
+    Member<Frame> m_parent;
 };
 
-class StubFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<StubFrameOwner>, public FrameOwner {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StubFrameOwner);
+class StubFrameOwner : public GarbageCollectedFinalized<StubFrameOwner>, public FrameOwner {
+    USING_GARBAGE_COLLECTED_MIXIN(StubFrameOwner);
 public:
-    static PassOwnPtrWillBeRawPtr<StubFrameOwner> create()
+    static RawPtr<StubFrameOwner> create()
     {
-        return adoptPtrWillBeNoop(new StubFrameOwner);
+        return (new StubFrameOwner);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE() { FrameOwner::trace(visitor); }
@@ -140,15 +140,15 @@ protected:
     OwnPtr<DummyPageHolder> dummyPageHolder;
     // We don't use the DocumentLoader directly in any tests, but need to keep it around as long
     // as the ResourceFetcher and Document live due to indirect usage.
-    RefPtrWillBePersistent<DocumentLoader> documentLoader;
-    RefPtrWillBePersistent<Document> document;
+    Persistent<DocumentLoader> documentLoader;
+    Persistent<Document> document;
     Persistent<FrameFetchContext> fetchContext;
 
-    OwnPtrWillBePersistent<StubFrameLoaderClientWithParent> childClient;
-    RefPtrWillBePersistent<LocalFrame> childFrame;
-    RefPtrWillBePersistent<DocumentLoader> childDocumentLoader;
-    RefPtrWillBePersistent<Document> childDocument;
-    OwnPtrWillBePersistent<StubFrameOwner> owner;
+    Persistent<StubFrameLoaderClientWithParent> childClient;
+    Persistent<LocalFrame> childFrame;
+    Persistent<DocumentLoader> childDocumentLoader;
+    Persistent<Document> childDocument;
+    Persistent<StubFrameOwner> owner;
 };
 
 // This test class sets up a mock frame loader client that expects a
@@ -162,7 +162,7 @@ protected:
         mainResourceUrl = KURL(KURL(), "https://www.example.test");
         MockFrameLoaderClient* client = new MockFrameLoaderClient;
         EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(url, securityInfo, WebURL(mainResourceUrl), CString()));
-        dummyPageHolder = DummyPageHolder::create(IntSize(500, 500), nullptr, adoptPtrWillBeNoop(client));
+        dummyPageHolder = DummyPageHolder::create(IntSize(500, 500), nullptr, (client));
         dummyPageHolder->page().setDeviceScaleFactor(1.0);
         documentLoader = DocumentLoader::create(&dummyPageHolder->frame(), ResourceRequest(mainResourceUrl), SubstituteData());
         document = toHTMLDocument(&dummyPageHolder->document());
@@ -575,7 +575,7 @@ TEST_F(FrameFetchContextDisplayedCertificateErrorsTest, MemoryCacheCertificateEr
     response.setURL(url);
     response.setSecurityInfo(securityInfo);
     response.setHasMajorCertificateErrors(true);
-    RefPtrWillBeRawPtr<Resource> resource = Resource::create(resourceRequest, Resource::Image);
+    RawPtr<Resource> resource = Resource::create(resourceRequest, Resource::Image);
     resource->setResponse(response);
     fetchContext->dispatchDidLoadResourceFromMemoryCache(resource.get(), WebURLRequest::FrameTypeNone, WebURLRequest::RequestContextImage);
 }