Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/css/FontFaceCache.h

Index: third_party/WebKit/Source/core/css/FontFaceCache.h
diff --git a/third_party/WebKit/Source/core/css/FontFaceCache.h b/third_party/WebKit/Source/core/css/FontFaceCache.h
index 8db2cb330dec6917680bc5948d2c176438db44e3..11ea85550d4ea9ed0d3143055c0faa4dcea7b805 100644
--- a/third_party/WebKit/Source/core/css/FontFaceCache.h
+++ b/third_party/WebKit/Source/core/css/FontFaceCache.h
@@ -48,18 +48,18 @@ public:
 
     // FIXME: Remove CSSFontSelector as argument. Passing CSSFontSelector here is
     // a result of egregious spaghettification in FontFace/FontFaceSet.
-    void add(CSSFontSelector*, const StyleRuleFontFace*, PassRefPtrWillBeRawPtr<FontFace>);
+    void add(CSSFontSelector*, const StyleRuleFontFace*, RawPtr<FontFace>);
     void remove(const StyleRuleFontFace*);
     void clearCSSConnected();
     void clearAll();
-    void addFontFace(CSSFontSelector*, PassRefPtrWillBeRawPtr<FontFace>, bool cssConnected);
+    void addFontFace(CSSFontSelector*, RawPtr<FontFace>, bool cssConnected);
     void removeFontFace(FontFace*, bool cssConnected);
 
     // FIXME: It's sort of weird that add/remove uses StyleRuleFontFace* as key,
     // but this function uses FontDescription/family pair.
     CSSSegmentedFontFace* get(const FontDescription&, const AtomicString& family);
 
-    const WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>>& cssConnectedFontFaces() const { return m_cssConnectedFontFaces; }
+    const HeapListHashSet<Member<FontFace>>& cssConnectedFontFaces() const { return m_cssConnectedFontFaces; }
 
     unsigned version() const { return m_version; }
     void incrementVersion() { ++m_version; }
@@ -67,13 +67,13 @@ public:
     DECLARE_TRACE();
 
 private:
-    using TraitsMap = WillBeHeapHashMap<unsigned, RefPtrWillBeMember<CSSSegmentedFontFace>>;
-    using FamilyToTraitsMap = WillBeHeapHashMap<String, OwnPtrWillBeMember<TraitsMap>, CaseFoldingHash>;
-    using StyleRuleToFontFace = WillBeHeapHashMap<RawPtrWillBeMember<const StyleRuleFontFace>, RefPtrWillBeMember<FontFace>>;
+    using TraitsMap = HeapHashMap<unsigned, Member<CSSSegmentedFontFace>>;
+    using FamilyToTraitsMap = HeapHashMap<String, Member<TraitsMap>, CaseFoldingHash>;
+    using StyleRuleToFontFace = HeapHashMap<Member<const StyleRuleFontFace>, Member<FontFace>>;
     FamilyToTraitsMap m_fontFaces;
     FamilyToTraitsMap m_fonts;
     StyleRuleToFontFace m_styleRuleToFontFace;
-    WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>> m_cssConnectedFontFaces;
+    HeapListHashSet<Member<FontFace>> m_cssConnectedFontFaces;
 
     // FIXME: See if this could be ditched
     // Used to compare Font instances, and the usage seems suspect.