Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 135 matching lines @@
         // returns allowCredentials value of m_resourceLoaderOptions.
         StoredCredentials effectiveAllowCredentials() const;
 
         // TODO(oilpan): DocumentThreadableLoader used to be a ResourceOwner,
         // but ResourceOwner was moved onto the oilpan heap before
         // DocumentThreadableLoader was ready. When DocumentThreadableLoader
         // moves onto the oilpan heap, make it a ResourceOwner again and remove
         // 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;
         Document& document() const;
 
         ThreadableLoaderClient* m_client;
         RawPtrWillBeWeakPersistent<Document> m_document;
 
         const ThreadableLoaderOptions m_options;
         // Some items may be overridden by m_forceDoNotAllowStoredCredentials
@@ skipping 39 matching lines @@
         // But this value is not the max number of total redirects allowed,
         // because same-origin redirects are not counted here.
         int m_corsRedirectLimit;
 
         const WebURLRequest::FetchRedirectMode m_redirectMode;
     };
 
 } // namespace blink
 
 #endif // DocumentThreadableLoader_h