Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h

Index: third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h
index 038512b20c8f2ca8660f795e1ddb38b775d63fe3..fd6fccdad51384bceb93bfcd182de159342a9211 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h
@@ -50,12 +50,12 @@ class InspectorCSSAgent;
 class InspectorResourceAgent;
 class InspectorStyleSheetBase;
 
-typedef WillBeHeapVector<RefPtrWillBeMember<CSSRule>> CSSRuleVector;
+typedef HeapVector<Member<CSSRule>> CSSRuleVector;
 typedef Vector<unsigned> LineEndings;
 
-class InspectorStyle final : public RefCountedWillBeGarbageCollectedFinalized<InspectorStyle> {
+class InspectorStyle final : public GarbageCollectedFinalized<InspectorStyle> {
 public:
-    static PassRefPtrWillBeRawPtr<InspectorStyle> create(PassRefPtrWillBeRawPtr<CSSStyleDeclaration>, PassRefPtrWillBeRawPtr<CSSRuleSourceData>, InspectorStyleSheetBase* parentStyleSheet);
+    static RawPtr<InspectorStyle> create(RawPtr<CSSStyleDeclaration>, RawPtr<CSSRuleSourceData>, InspectorStyleSheetBase* parentStyleSheet);
 
     CSSStyleDeclaration* cssStyle() { return m_style.get(); }
     PassOwnPtr<protocol::CSS::CSSStyle> buildObjectForStyle();
@@ -66,18 +66,18 @@ public:
     DECLARE_TRACE();
 
 private:
-    InspectorStyle(PassRefPtrWillBeRawPtr<CSSStyleDeclaration>, PassRefPtrWillBeRawPtr<CSSRuleSourceData>, InspectorStyleSheetBase* parentStyleSheet);
+    InspectorStyle(RawPtr<CSSStyleDeclaration>, RawPtr<CSSRuleSourceData>, InspectorStyleSheetBase* parentStyleSheet);
 
-    void populateAllProperties(WillBeHeapVector<CSSPropertySourceData>& result);
+    void populateAllProperties(HeapVector<CSSPropertySourceData>& result);
     PassOwnPtr<protocol::CSS::CSSStyle> styleWithProperties();
     String shorthandValue(const String& shorthandProperty);
 
-    RefPtrWillBeMember<CSSStyleDeclaration> m_style;
-    RefPtrWillBeMember<CSSRuleSourceData> m_sourceData;
-    RawPtrWillBeMember<InspectorStyleSheetBase> m_parentStyleSheet;
+    Member<CSSStyleDeclaration> m_style;
+    Member<CSSRuleSourceData> m_sourceData;
+    Member<InspectorStyleSheetBase> m_parentStyleSheet;
 };
 
-class InspectorStyleSheetBase : public RefCountedWillBeGarbageCollectedFinalized<InspectorStyleSheetBase> {
+class InspectorStyleSheetBase : public GarbageCollectedFinalized<InspectorStyleSheetBase> {
 public:
     class CORE_EXPORT Listener {
     public:
@@ -108,7 +108,7 @@ protected:
     void onStyleSheetTextChanged();
     const LineEndings* lineEndings();
 
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) = 0;
+    virtual RawPtr<InspectorStyle> inspectorStyle(RawPtr<CSSStyleDeclaration>) = 0;
 
 private:
     friend class InspectorStyle;
@@ -120,7 +120,7 @@ private:
 
 class InspectorStyleSheet : public InspectorStyleSheetBase {
 public:
-    static PassRefPtrWillBeRawPtr<InspectorStyleSheet> create(InspectorResourceAgent*, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, const String& origin, const String& documentURL, InspectorCSSAgent*);
+    static RawPtr<InspectorStyleSheet> create(InspectorResourceAgent*, RawPtr<CSSStyleSheet> pageStyleSheet, const String& origin, const String& documentURL, InspectorCSSAgent*);
 
     ~InspectorStyleSheet() override;
     DECLARE_VIRTUAL_TRACE();
@@ -128,11 +128,11 @@ public:
     String finalURL();
     bool setText(const String&, ExceptionState&) override;
     bool getText(String* result) override;
-    RefPtrWillBeRawPtr<CSSStyleRule>  setRuleSelector(const SourceRange&, const String& selector, SourceRange* newRange, String* oldSelector, ExceptionState&);
-    PassRefPtrWillBeRawPtr<CSSKeyframeRule>  setKeyframeKey(const SourceRange&, const String& text, SourceRange* newRange, String* oldText, ExceptionState&);
-    PassRefPtrWillBeRawPtr<CSSRule>  setStyleText(const SourceRange&, const String& text, SourceRange* newRange, String* oldSelector, ExceptionState&);
-    RefPtrWillBeRawPtr<CSSMediaRule>  setMediaRuleText(const SourceRange&, const String& selector, SourceRange* newRange, String* oldSelector, ExceptionState&);
-    RefPtrWillBeRawPtr<CSSStyleRule>  addRule(const String& ruleText, const SourceRange& location, SourceRange* addedRange, ExceptionState&);
+    RawPtr<CSSStyleRule>  setRuleSelector(const SourceRange&, const String& selector, SourceRange* newRange, String* oldSelector, ExceptionState&);
+    RawPtr<CSSKeyframeRule>  setKeyframeKey(const SourceRange&, const String& text, SourceRange* newRange, String* oldText, ExceptionState&);
+    RawPtr<CSSRule>  setStyleText(const SourceRange&, const String& text, SourceRange* newRange, String* oldSelector, ExceptionState&);
+    RawPtr<CSSMediaRule>  setMediaRuleText(const SourceRange&, const String& selector, SourceRange* newRange, String* oldSelector, ExceptionState&);
+    RawPtr<CSSStyleRule>  addRule(const String& ruleText, const SourceRange& location, SourceRange* addedRange, ExceptionState&);
     bool deleteRule(const SourceRange&, ExceptionState&);
 
     CSSStyleSheet* pageStyleSheet() { return m_pageStyleSheet.get(); }
@@ -147,18 +147,18 @@ public:
 
     bool isInlineStyle() override { return false; }
     const CSSRuleVector& flatRules();
-    RefPtrWillBeRawPtr<CSSRuleSourceData> sourceDataForRule(RefPtrWillBeRawPtr<CSSRule>);
+    RawPtr<CSSRuleSourceData> sourceDataForRule(RawPtr<CSSRule>);
     String sourceMapURL() override;
 
 protected:
-    PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) override;
+    RawPtr<InspectorStyle> inspectorStyle(RawPtr<CSSStyleDeclaration>) override;
 
 private:
-    InspectorStyleSheet(InspectorResourceAgent*, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, const String& origin, const String& documentURL, InspectorCSSAgent*);
-    RefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAfterSourceRange(const SourceRange&);
-    RefPtrWillBeRawPtr<CSSRuleSourceData> findRuleByHeaderRange(const SourceRange&);
-    RefPtrWillBeRawPtr<CSSRuleSourceData> findRuleByBodyRange(const SourceRange&);
-    RefPtrWillBeRawPtr<CSSRule> ruleForSourceData(RefPtrWillBeRawPtr<CSSRuleSourceData>);
+    InspectorStyleSheet(InspectorResourceAgent*, RawPtr<CSSStyleSheet> pageStyleSheet, const String& origin, const String& documentURL, InspectorCSSAgent*);
+    RawPtr<CSSRuleSourceData> ruleSourceDataAfterSourceRange(const SourceRange&);
+    RawPtr<CSSRuleSourceData> findRuleByHeaderRange(const SourceRange&);
+    RawPtr<CSSRuleSourceData> findRuleByBodyRange(const SourceRange&);
+    RawPtr<CSSRule> ruleForSourceData(RawPtr<CSSRuleSourceData>);
     CSSStyleRule* insertCSSOMRuleInStyleSheet(CSSRule* insertBefore, const String& ruleText, ExceptionState&);
     CSSStyleRule* insertCSSOMRuleInMediaRule(CSSMediaRule*, CSSRule* insertBefore, const String& ruleText, ExceptionState&);
     CSSStyleRule* insertCSSOMRuleBySourceRange(const SourceRange&, const String& ruleText, ExceptionState&);
@@ -176,12 +176,12 @@ private:
     void innerSetText(const String& newText, bool markAsLocallyModified);
     Element* ownerStyleElement();
 
-    RawPtrWillBeMember<InspectorCSSAgent> m_cssAgent;
-    RawPtrWillBeMember<InspectorResourceAgent> m_resourceAgent;
-    RefPtrWillBeMember<CSSStyleSheet> m_pageStyleSheet;
+    Member<InspectorCSSAgent> m_cssAgent;
+    Member<InspectorResourceAgent> m_resourceAgent;
+    Member<CSSStyleSheet> m_pageStyleSheet;
     String m_origin;
     String m_documentURL;
-    OwnPtrWillBeMember<RuleSourceDataList> m_sourceData;
+    Member<RuleSourceDataList> m_sourceData;
     String m_text;
     CSSRuleVector m_cssomFlatRules;
     CSSRuleVector m_parsedFlatRules;
@@ -193,28 +193,28 @@ private:
 
 class InspectorStyleSheetForInlineStyle final : public InspectorStyleSheetBase {
 public:
-    static PassRefPtrWillBeRawPtr<InspectorStyleSheetForInlineStyle> create(PassRefPtrWillBeRawPtr<Element>, Listener*);
+    static RawPtr<InspectorStyleSheetForInlineStyle> create(RawPtr<Element>, Listener*);
 
     void didModifyElementAttribute();
     bool setText(const String&, ExceptionState&) override;
     bool getText(String* result) override;
     CSSStyleDeclaration* inlineStyle();
-    RefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceData();
+    RawPtr<CSSRuleSourceData> ruleSourceData();
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
-    PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) override;
+    RawPtr<InspectorStyle> inspectorStyle(RawPtr<CSSStyleDeclaration>) override;
 
     // Also accessed by friend class InspectorStyle.
     bool isInlineStyle() override { return true; }
 
 private:
-    InspectorStyleSheetForInlineStyle(PassRefPtrWillBeRawPtr<Element>, Listener*);
+    InspectorStyleSheetForInlineStyle(RawPtr<Element>, Listener*);
     const String& elementStyleText();
 
-    RefPtrWillBeMember<Element> m_element;
-    RefPtrWillBeMember<InspectorStyle> m_inspectorStyle;
+    Member<Element> m_element;
+    Member<InspectorStyle> m_inspectorStyle;
 };
 
 } // namespace blink