Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/fetch/FontResource.h

Index: third_party/WebKit/Source/core/fetch/FontResource.h
diff --git a/third_party/WebKit/Source/core/fetch/FontResource.h b/third_party/WebKit/Source/core/fetch/FontResource.h
index 7586499cf222ef144f961f621bf0e816c3e70536..3bda896ad77978342f13dfe305e4ece218fb10d8 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.h
+++ b/third_party/WebKit/Source/core/fetch/FontResource.h
@@ -26,8 +26,8 @@
 #ifndef FontResource_h
 #define FontResource_h
 
+#include "core/fetch/Resource.h"
 #include "core/fetch/ResourceClient.h"
-#include "core/fetch/ResourcePtr.h"
 #include "platform/Timer.h"
 #include "platform/fonts/FontOrientation.h"
 #include "wtf/OwnPtr.h"
@@ -38,12 +38,13 @@ class FetchRequest;
 class ResourceFetcher;
 class FontPlatformData;
 class FontCustomPlatformData;
+class FontResourceClient;
 
 class FontResource final : public Resource {
 public:
-    using ClientType = ResourceClient;
+    using ClientType = FontResourceClient;
 
-    static ResourcePtr<FontResource> fetch(FetchRequest&, ResourceFetcher*);
+    static PassRefPtrWillBeRawPtr<FontResource> fetch(FetchRequest&, ResourceFetcher*);
     ~FontResource() override;
 
     void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
@@ -74,9 +75,9 @@ private:
         FontResourceFactory()
             : ResourceFactory(Resource::Font) { }
 
-        Resource* create(const ResourceRequest& request, const String& charset) const override
+        PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, const String& charset) const override
         {
-            return new FontResource(request);
+            return adoptRefWillBeNoop(new FontResource(request));
         }
     };
     FontResource(const ResourceRequest&);