Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/dom/NthIndexCache.h

Index: third_party/WebKit/Source/core/dom/NthIndexCache.h
diff --git a/third_party/WebKit/Source/core/dom/NthIndexCache.h b/third_party/WebKit/Source/core/dom/NthIndexCache.h
index 5ae0d46e250292a01a19105de6b57fcef06870ee..e0dc45ee6a01f92b458c76729f0510ccedf1c558 100644
--- a/third_party/WebKit/Source/core/dom/NthIndexCache.h
+++ b/third_party/WebKit/Source/core/dom/NthIndexCache.h
@@ -16,10 +16,8 @@ namespace blink {
 
 class Document;
 
-class CORE_EXPORT NthIndexData final : public NoBaseWillBeGarbageCollected<NthIndexData> {
-    USING_FAST_MALLOC_WILL_BE_REMOVED(NthIndexData);
+class CORE_EXPORT NthIndexData final : public GarbageCollected<NthIndexData> {
     WTF_MAKE_NONCOPYABLE(NthIndexData);
-    DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NthIndexData);
 public:
     NthIndexData(ContainerNode&);
     NthIndexData(ContainerNode&, const QualifiedName& type);
@@ -30,7 +28,7 @@ public:
     unsigned nthLastOfTypeIndex(Element&) const;
 
 private:
-    WillBeHeapHashMap<RawPtrWillBeMember<Element>, unsigned> m_elementIndexMap;
+    HeapHashMap<Member<Element>, unsigned> m_elementIndexMap;
     unsigned m_count = 0;
 
     DECLARE_TRACE();
@@ -49,18 +47,18 @@ public:
     static unsigned nthLastOfTypeIndex(Element&);
 
 private:
-    using IndexByType = WillBeHeapHashMap<String, OwnPtrWillBeMember<NthIndexData>>;
-    using ParentMap = WillBeHeapHashMap<RefPtrWillBeMember<Node>, OwnPtrWillBeMember<NthIndexData>>;
-    using ParentMapForType = WillBeHeapHashMap<RefPtrWillBeMember<Node>, OwnPtrWillBeMember<IndexByType>>;
+    using IndexByType = HeapHashMap<String, Member<NthIndexData>>;
+    using ParentMap = HeapHashMap<Member<Node>, Member<NthIndexData>>;
+    using ParentMapForType = HeapHashMap<Member<Node>, Member<IndexByType>>;
 
     void cacheNthIndexDataForParent(Element&);
     void cacheNthOfTypeIndexDataForParent(Element&);
     IndexByType& ensureTypeIndexMap(ContainerNode&);
     NthIndexData* nthTypeIndexDataForParent(Element&) const;
 
-    RawPtrWillBeMember<Document> m_document;
-    OwnPtrWillBeMember<ParentMap> m_parentMap;
-    OwnPtrWillBeMember<ParentMapForType> m_parentMapForType;
+    Member<Document> m_document;
+    Member<ParentMap> m_parentMap;
+    Member<ParentMapForType> m_parentMapForType;
 
 #if ENABLE(ASSERT)
     uint64_t m_domTreeVersion;