Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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

Index: third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
index 9d58bcb68e6a54f66d91331636765907e00bae4c..a346a5d76ec670ffb6a39c1194e902167b4e2afb 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
@@ -7,7 +7,6 @@
 
 #include "core/css/CSSFontFaceSource.h"
 #include "core/fetch/FontResource.h"
-#include "core/fetch/ResourcePtr.h"
 #include "wtf/Allocator.h"
 
 namespace blink {
@@ -28,7 +27,7 @@ class RemoteFontFaceSource final : public CSSFontFaceSource, public FontResource
 public:
     enum DisplayPeriod { BlockPeriod, SwapPeriod, FailurePeriod };
 
-    explicit RemoteFontFaceSource(FontResource*, PassRefPtrWillBeRawPtr<FontLoader>, FontDisplay);
+    explicit RemoteFontFaceSource(PassRefPtrWillBeRawPtr<FontResource>, PassRefPtrWillBeRawPtr<FontLoader>, FontDisplay);
     ~RemoteFontFaceSource() override;
     void dispose();
 
@@ -80,7 +79,7 @@ private:
     void switchToSwapPeriod();
     void switchToFailurePeriod();
 
-    ResourcePtr<FontResource> m_font;
+    RefPtrWillBeMember<FontResource> m_font;
     RefPtrWillBeMember<FontLoader> m_fontLoader;
     const FontDisplay m_display;
     DisplayPeriod m_period;