Oilpan: Remove most WillBe types from the code base

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/loader/LinkLoader.h"
 
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/Settings.h"
 #include "core/html/LinkRelAttribute.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/LinkLoaderClient.h"
 #include "core/loader/NetworkHintsInterface.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/network/ResourceLoadPriority.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <base/macros.h>
 
 namespace blink {
 
-class MockLinkLoaderClient final : public NoBaseWillBeGarbageCollectedFinalized<MockLinkLoaderClient>, public LinkLoaderClient {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MockLinkLoaderClient);
+class MockLinkLoaderClient final : public GarbageCollectedFinalized<MockLinkLoaderClient>, public LinkLoaderClient {
+    USING_GARBAGE_COLLECTED_MIXIN(MockLinkLoaderClient);
 public:
-    static PassOwnPtrWillBeRawPtr<MockLinkLoaderClient> create(bool shouldLoad)
+    static RawPtr<MockLinkLoaderClient> create(bool shouldLoad)
     {
-        return adoptPtrWillBeNoop(new MockLinkLoaderClient(shouldLoad));
+        return (new MockLinkLoaderClient(shouldLoad));
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE() { LinkLoaderClient::trace(visitor); }
 
     bool shouldLoadLink() override
     {
         return m_shouldLoad;
     }
 
     void linkLoaded() override {}
@@ skipping 66 matching lines @@
         // TODO(yoav): subresource should be *very* low priority (rather than low).
         {"data://example.test/cat.empty", "", ResourceLoadPriorityLow, WebURLRequest::RequestContextSubresource, true, ""},
         {"data://example.test/cat.blob", "blabla", ResourceLoadPriorityLow, WebURLRequest::RequestContextSubresource, true, ""},
         {"bla://example.test/cat.gif", "image", ResourceLoadPriorityUnresolved, WebURLRequest::RequestContextImage, false, ""},
     };
 
     // Test the cases with a single header
     for (const auto& testCase : cases) {
         OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
         dummyPageHolder->frame().settings()->setScriptEnabled(true);
-        OwnPtrWillBePersistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
-        OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
+        Persistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
+        RawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
         KURL hrefURL = KURL(KURL(), testCase.href);
         loader->loadLink(LinkRelAttribute("preload"),
             CrossOriginAttributeNotSet,
             String(),
             testCase.as,
             hrefURL,
             dummyPageHolder->document(),
             NetworkHintsMock());
         ASSERT(dummyPageHolder->document().fetcher());
-        WillBeHeapListHashSet<RefPtrWillBeMember<Resource>>* preloads = dummyPageHolder->document().fetcher()->preloads();
+        HeapListHashSet<Member<Resource>>* preloads = dummyPageHolder->document().fetcher()->preloads();
         if (testCase.shouldLoad)
             ASSERT_NE(nullptr, preloads);
         if (preloads) {
             if (testCase.priority == ResourceLoadPriorityUnresolved) {
                 ASSERT_EQ((unsigned)0, preloads->size());
             } else {
                 ASSERT_EQ((unsigned)1, preloads->size());
                 if (preloads->size() > 0) {
                     Resource* resource = preloads->begin().get()->get();
                     ASSERT_EQ(testCase.priority, resource->resourceRequest().priority());
@@ skipping 17 matching lines @@
         {"https://example.com/", true},
         {"//example.com/", true},
     };
 
     // TODO(yoav): Test (and fix) shouldLoad = false
 
     // Test the cases with a single header
     for (const auto& testCase : cases) {
         OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
         dummyPageHolder->document().settings()->setDNSPrefetchingEnabled(true);
-        OwnPtrWillBePersistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
-        OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
+        Persistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
+        RawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
         KURL hrefURL = KURL(KURL(ParsedURLStringTag(), String("http://example.com")), testCase.href);
         NetworkHintsMock networkHints;
         loader->loadLink(LinkRelAttribute("dns-prefetch"),
             CrossOriginAttributeNotSet,
             String(),
             String(),
             hrefURL,
             dummyPageHolder->document(),
             networkHints);
         ASSERT_FALSE(networkHints.didPreconnect());
@@ skipping 12 matching lines @@
     } cases[] = {
         {"http://example.com/", CrossOriginAttributeNotSet, true, false, false},
         {"https://example.com/", CrossOriginAttributeNotSet, true, true, false},
         {"http://example.com/", CrossOriginAttributeAnonymous, true, false, true},
         {"//example.com/", CrossOriginAttributeNotSet, true, false, false},
     };
 
     // Test the cases with a single header
     for (const auto& testCase : cases) {
         OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
-        OwnPtrWillBePersistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
-        OwnPtrWillBeRawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
+        Persistent<MockLinkLoaderClient> loaderClient = MockLinkLoaderClient::create(testCase.shouldLoad);
+        RawPtr<LinkLoader> loader = LinkLoader::create(loaderClient.get());
         KURL hrefURL = KURL(KURL(ParsedURLStringTag(), String("http://example.com")), testCase.href);
         NetworkHintsMock networkHints;
         loader->loadLink(LinkRelAttribute("preconnect"),
             testCase.crossOrigin,
             String(),
             String(),
             hrefURL,
             dummyPageHolder->document(),
             networkHints);
         ASSERT_EQ(testCase.shouldLoad, networkHints.didPreconnect());
         ASSERT_EQ(testCase.isHTTPS, networkHints.isHTTPS());
         ASSERT_EQ(testCase.isCrossOrigin, networkHints.isCrossOrigin());
     }
 }
 
 } // namespace blink