Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h

Index: third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
diff --git a/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
index b60b375cdaa28ed7f6b2b1909e9ca2e46757f724..6cf9c54f7433458cd1e2a65be35324134dfe85aa 100644
--- a/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
@@ -42,13 +42,12 @@ class StyleSheetContents;
 class ViewportStyleResolver;
 
 // This class selects a ComputedStyle for a given element based on a collection of stylesheets.
-class ScopedStyleResolver final : public NoBaseWillBeGarbageCollected<ScopedStyleResolver> {
+class ScopedStyleResolver final : public GarbageCollected<ScopedStyleResolver> {
     WTF_MAKE_NONCOPYABLE(ScopedStyleResolver);
-    USING_FAST_MALLOC_WILL_BE_REMOVED(ScopedStyleResolver);
 public:
-    static PassOwnPtrWillBeRawPtr<ScopedStyleResolver> create(TreeScope& scope)
+    static RawPtr<ScopedStyleResolver> create(TreeScope& scope)
     {
-        return adoptPtrWillBeNoop(new ScopedStyleResolver(scope));
+        return new ScopedStyleResolver(scope);
     }
 
     const TreeScope& treeScope() const { return *m_scope; }
@@ -61,7 +60,7 @@ public:
     void collectMatchingShadowHostRules(ElementRuleCollector&, CascadeOrder = ignoreCascadeOrder);
     void collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&, CascadeOrder = ignoreCascadeOrder);
     void matchPageRules(PageRuleCollector&);
-    void collectFeaturesTo(RuleFeatureSet&, WillBeHeapHashSet<RawPtrWillBeMember<const StyleSheetContents>>& visitedSharedStyleSheetContents) const;
+    void collectFeaturesTo(RuleFeatureSet&, HeapHashSet<Member<const StyleSheetContents>>& visitedSharedStyleSheetContents) const;
     void resetAuthorStyle();
     void collectViewportRulesTo(ViewportStyleResolver*) const;
     bool hasDeepOrShadowSelector() const { return m_hasDeepOrShadowSelector; }
@@ -77,39 +76,39 @@ private:
     void addTreeBoundaryCrossingRules(const RuleSet&, CSSStyleSheet*, unsigned sheetIndex);
     void addKeyframeRules(const RuleSet&);
     void addFontFaceRules(const RuleSet&);
-    void addKeyframeStyle(PassRefPtrWillBeRawPtr<StyleRuleKeyframes>);
+    void addKeyframeStyle(RawPtr<StyleRuleKeyframes>);
 
-    RawPtrWillBeMember<TreeScope> m_scope;
+    Member<TreeScope> m_scope;
 
-    WillBeHeapVector<RawPtrWillBeMember<CSSStyleSheet>> m_authorStyleSheets;
+    HeapVector<Member<CSSStyleSheet>> m_authorStyleSheets;
 
-    using KeyframesRuleMap = WillBeHeapHashMap<const StringImpl*, RefPtrWillBeMember<StyleRuleKeyframes>>;
+    using KeyframesRuleMap = HeapHashMap<const StringImpl*, Member<StyleRuleKeyframes>>;
     KeyframesRuleMap m_keyframesRuleMap;
 
-    class RuleSubSet final : public NoBaseWillBeGarbageCollected<RuleSubSet> {
+    class RuleSubSet final : public GarbageCollected<RuleSubSet> {
     public:
-        static PassOwnPtrWillBeRawPtr<RuleSubSet> create(CSSStyleSheet* sheet, unsigned index, PassOwnPtrWillBeRawPtr<RuleSet> rules)
+        static RawPtr<RuleSubSet> create(CSSStyleSheet* sheet, unsigned index, RawPtr<RuleSet> rules)
         {
-            return adoptPtrWillBeNoop(new RuleSubSet(sheet, index, rules));
+            return new RuleSubSet(sheet, index, rules);
         }
 
-        RawPtrWillBeMember<CSSStyleSheet> m_parentStyleSheet;
+        Member<CSSStyleSheet> m_parentStyleSheet;
         unsigned m_parentIndex;
-        OwnPtrWillBeMember<RuleSet> m_ruleSet;
+        Member<RuleSet> m_ruleSet;
 
         DECLARE_TRACE();
 
     private:
-        RuleSubSet(CSSStyleSheet* sheet, unsigned index, PassOwnPtrWillBeRawPtr<RuleSet> rules)
+        RuleSubSet(CSSStyleSheet* sheet, unsigned index, RawPtr<RuleSet> rules)
             : m_parentStyleSheet(sheet)
             , m_parentIndex(index)
             , m_ruleSet(rules)
         {
         }
     };
-    using CSSStyleSheetRuleSubSet = WillBeHeapVector<OwnPtrWillBeMember<RuleSubSet>>;
+    using CSSStyleSheetRuleSubSet = HeapVector<Member<RuleSubSet>>;
 
-    OwnPtrWillBeMember<CSSStyleSheetRuleSubSet> m_treeBoundaryCrossingRuleSet;
+    Member<CSSStyleSheetRuleSubSet> m_treeBoundaryCrossingRuleSet;
     bool m_hasDeepOrShadowSelector = false;
 };