Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp

Index: third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp b/third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp
index c7ddcc3013e85517cca5838f5fc0903a66f884b5..c8e21502ca891d7d506afb12fd232c71a91cb1ff 100644
--- a/third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp
+++ b/third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp
@@ -19,15 +19,15 @@ namespace blink {
 namespace {
 
 template <typename T>
-class GlobalFetchImpl final : public NoBaseWillBeGarbageCollectedFinalized<GlobalFetchImpl<T>>, public GlobalFetch::ScopedFetcher, public WillBeHeapSupplement<T> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(GlobalFetchImpl);
+class GlobalFetchImpl final : public GarbageCollectedFinalized<GlobalFetchImpl<T>>, public GlobalFetch::ScopedFetcher, public HeapSupplement<T> {
+    USING_GARBAGE_COLLECTED_MIXIN(GlobalFetchImpl);
 public:
-    static WeakPtrWillBeRawPtr<ScopedFetcher> from(T& supplementable, ExecutionContext* executionContext)
+    static RawPtr<ScopedFetcher> from(T& supplementable, ExecutionContext* executionContext)
     {
-        GlobalFetchImpl* supplement = static_cast<GlobalFetchImpl*>(WillBeHeapSupplement<T>::from(supplementable, supplementName()));
+        GlobalFetchImpl* supplement = static_cast<GlobalFetchImpl*>(HeapSupplement<T>::from(supplementable, supplementName()));
         if (!supplement) {
             supplement = new GlobalFetchImpl(executionContext);
-            WillBeHeapSupplement<T>::provideTo(supplementable, supplementName(), adoptPtrWillBeNoop(supplement));
+            HeapSupplement<T>::provideTo(supplementable, supplementName(), (supplement));
         }
 #if ENABLE(OILPAN)
         return supplement;
@@ -57,12 +57,12 @@ public:
         visitor->trace(m_fetchManager);
         visitor->trace(m_stopDetector);
         ScopedFetcher::trace(visitor);
-        WillBeHeapSupplement<T>::trace(visitor);
+        HeapSupplement<T>::trace(visitor);
     }
 
 private:
     class StopDetector final : public GarbageCollectedFinalized<StopDetector>, public ActiveDOMObject {
-        WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StopDetector);
+        USING_GARBAGE_COLLECTED_MIXIN(StopDetector);
     public:
         static StopDetector* create(ExecutionContext* executionContext, FetchManager* fetchManager)
         {
@@ -98,8 +98,8 @@ private:
     }
     static const char* supplementName() { return "GlobalFetch"; }
 
-    PersistentWillBeMember<FetchManager> m_fetchManager;
-    PersistentWillBeMember<StopDetector> m_stopDetector;
+    Member<FetchManager> m_fetchManager;
+    Member<StopDetector> m_stopDetector;
 #if !ENABLE(OILPAN)
     WeakPtrFactory<ScopedFetcher> m_weakFactory;
 #endif
@@ -111,12 +111,12 @@ GlobalFetch::ScopedFetcher::~ScopedFetcher()
 {
 }
 
-WeakPtrWillBeRawPtr<GlobalFetch::ScopedFetcher> GlobalFetch::ScopedFetcher::from(DOMWindow& window)
+RawPtr<GlobalFetch::ScopedFetcher> GlobalFetch::ScopedFetcher::from(DOMWindow& window)
 {
     return GlobalFetchImpl<LocalDOMWindow>::from(toLocalDOMWindow(window), window.executionContext());
 }
 
-WeakPtrWillBeRawPtr<GlobalFetch::ScopedFetcher> GlobalFetch::ScopedFetcher::from(WorkerGlobalScope& worker)
+RawPtr<GlobalFetch::ScopedFetcher> GlobalFetch::ScopedFetcher::from(WorkerGlobalScope& worker)
 {
     return GlobalFetchImpl<WorkerGlobalScope>::from(worker, worker.executionContext());
 }