Merge DocumentThreadableLoader's m_weakPtrFactory into that of RawResourceClient

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

Index: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
index bce49a4842d27df9c2fad6cc099b6060a85096ca..22a366e86e12857de33126fa547f73d76b6fe05d 100644
--- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
@@ -149,7 +149,6 @@ DocumentThreadableLoader::DocumentThreadableLoader(Document& document, Threadabl
     , m_requestStartedSeconds(0.0)
     , m_corsRedirectLimit(kMaxCORSRedirects)
     , m_redirectMode(WebURLRequest::FetchRedirectModeFollow)
-    , m_weakFactory(this)
 {
     ASSERT(client);
 }
@@ -439,7 +438,7 @@ void DocumentThreadableLoader::redirectReceived(Resource* resource, ResourceRequ
     if (m_redirectMode == WebURLRequest::FetchRedirectModeManual) {
         // Keep |this| alive even if the client release a reference in
         // responseReceived().
-        WeakPtr<DocumentThreadableLoader> self(m_weakFactory.createWeakPtr());
+        WeakPtr<RawResourceClient> self(createWeakPtr());
 
         // We use |m_redirectMode| to check the original redirect mode.
         // |request| is a new request for redirect. So we don't set the redirect
@@ -882,7 +881,7 @@ void DocumentThreadableLoader::loadRequest(const ResourceRequest& request, Resou
             newRequest.setOriginRestriction(FetchRequest::NoOriginRestriction);
         ASSERT(!resource());
 
-        WeakPtr<DocumentThreadableLoader> self(m_weakFactory.createWeakPtr());
+        WeakPtr<RawResourceClient> self(createWeakPtr());
 
         if (request.requestContext() == WebURLRequest::RequestContextVideo || request.requestContext() == WebURLRequest::RequestContextAudio)
             setResource(RawResource::fetchMedia(newRequest, document().fetcher()));