Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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

Index: third_party/WebKit/Source/core/fetch/ScriptResource.h
diff --git a/third_party/WebKit/Source/core/fetch/ScriptResource.h b/third_party/WebKit/Source/core/fetch/ScriptResource.h
index 3cab8be7442527c9d0c198a1bc16f3e58edb9a49..c49f1c07077d1fb6f3ce63acb8ece9abc06d57d6 100644
--- a/third_party/WebKit/Source/core/fetch/ScriptResource.h
+++ b/third_party/WebKit/Source/core/fetch/ScriptResource.h
@@ -49,10 +49,13 @@ public:
 class CORE_EXPORT ScriptResource final : public TextResource {
 public:
     using ClientType = ScriptResourceClient;
-    static ResourcePtr<ScriptResource> fetch(FetchRequest&, ResourceFetcher*);
+    static PassRefPtrWillBeRawPtr<ScriptResource> fetch(FetchRequest&, ResourceFetcher*);
 
     // Public for testing
-    ScriptResource(const ResourceRequest&, const String& charset);
+    static PassRefPtrWillBeRawPtr<ScriptResource> create(const ResourceRequest& request, const String& charset)
+    {
+        return adoptRefWillBeNoop(new ScriptResource(request, charset));
+    }
 
     ~ScriptResource() override;
 
@@ -81,12 +84,14 @@ private:
         ScriptResourceFactory()
             : ResourceFactory(Resource::Script) { }
 
-        Resource* create(const ResourceRequest& request, const String& charset) const override
+        PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, const String& charset) const override
         {
-            return new ScriptResource(request, charset);
+            return adoptRefWillBeNoop(new ScriptResource(request, charset));
         }
     };
 
+    ScriptResource(const ResourceRequest&, const String& charset);
+
     bool m_integrityChecked;
     IntegrityMetadataSet m_integrityMetadata;