Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

Index: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
index 7907c2e936d3c8e4eb51d06a5b43d95d30844f24..b46bc61ccf5d384e6e6524e25acc6771c22b0681 100644
--- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
+++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
@@ -153,22 +153,20 @@ class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, priv
         // this re-implementation of ResourceOwner.
         RawResource* resource() const { return m_resource.get(); }
         void clearResource() { setResource(nullptr); }
-        void setResource(const ResourcePtr<RawResource>& newResource)
+        void setResource(const PassRefPtrWillBeRawPtr<RawResource>& newResource)
         {
             if (newResource == m_resource)
                 return;
 
-            if (ResourcePtr<RawResource> oldResource = m_resource) {
-                m_resource.clear();
+            if (PassRefPtrWillBeRawPtr<RawResource> oldResource = m_resource.release())
                 oldResource->removeClient(this);
-            }
 
             if (newResource) {
                 m_resource = newResource;
                 m_resource->addClient(this);
             }
         }
-        ResourcePtr<RawResource> m_resource;
+        RefPtrWillBePersistent<RawResource> m_resource;
         // End of ResourceOwner re-implementation, see above.
 
         SecurityOrigin* securityOrigin() const;