Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp

Index: third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp
diff --git a/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp b/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp
index 4885b7eca2eedeb31f92ffef6c3c8b12d864aa3d..1f1031664a9886ffdcc51fc3ba79f5f0cf175574 100644
--- a/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp
+++ b/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp
@@ -19,15 +19,15 @@ namespace blink {
 namespace {
 
 template <typename T>
-class GlobalCacheStorageImpl final : public NoBaseWillBeGarbageCollectedFinalized<GlobalCacheStorageImpl<T>>, public WillBeHeapSupplement<T> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(GlobalCacheStorageImpl);
+class GlobalCacheStorageImpl final : public GarbageCollectedFinalized<GlobalCacheStorageImpl<T>>, public HeapSupplement<T> {
+    USING_GARBAGE_COLLECTED_MIXIN(GlobalCacheStorageImpl);
 public:
     static GlobalCacheStorageImpl& from(T& supplementable, ExecutionContext* executionContext)
     {
-        GlobalCacheStorageImpl* supplement = static_cast<GlobalCacheStorageImpl*>(WillBeHeapSupplement<T>::from(supplementable, name()));
+        GlobalCacheStorageImpl* supplement = static_cast<GlobalCacheStorageImpl*>(HeapSupplement<T>::from(supplementable, name()));
         if (!supplement) {
             supplement = new GlobalCacheStorageImpl();
-            WillBeHeapSupplement<T>::provideTo(supplementable, name(), adoptPtrWillBeNoop(supplement));
+            HeapSupplement<T>::provideTo(supplementable, name(), (supplement));
         }
         return *supplement;
     }
@@ -64,7 +64,7 @@ public:
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_caches);
-        WillBeHeapSupplement<T>::trace(visitor);
+        HeapSupplement<T>::trace(visitor);
     }
 
 private:
@@ -74,7 +74,7 @@ private:
 
     static const char* name() { return "CacheStorage"; }
 
-    PersistentWillBeMember<CacheStorage> m_caches;
+    Member<CacheStorage> m_caches;
 };
 
 } // namespace