Refactoring starting a resource load

third_party/WebKit/Source/core/fetch/Resource.cpp

Index: third_party/WebKit/Source/core/fetch/Resource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index 91175f1b88a4f02ed950e3580d0a8d5bad26be3c..799e59db021927c1bb2c260ae041da28397dd7d9 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -29,7 +29,6 @@
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceClient.h"
 #include "core/fetch/ResourceClientOrObserverWalker.h"
-#include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourceLoader.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InstanceCounters.h"
@@ -337,28 +336,12 @@ DEFINE_TRACE(Resource)
     visitor->trace(m_cacheHandler);
 }
 
-void Resource::load(ResourceFetcher* fetcher)
+void Resource::setLoader(ResourceLoader* loader)
 {
-    // TOOD(japhet): Temporary, out of place hack to stop a top crasher.
-    // Make this more organic.
-    if (!fetcher->loadingTaskRunner())
-        return;
-
     RELEASE_ASSERT(!m_loader);
     ASSERT(stillNeedsLoad());
+    m_loader = loader;
     m_status = Pending;
-
-    ResourceRequest& request(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest);
-    KURL url = request.url();
-    request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredCredentials);
-
-    m_fetcherSecurityOrigin = fetcher->context().getSecurityOrigin();
-    m_loader = ResourceLoader::create(fetcher, this);
-    m_loader->start(request);
-    // If the request reference is null (i.e., a synchronous revalidation will
-    // null the request), don't make the request non-null by setting the url.
-    if (!request.isNull())
-        request.setURL(url);
 }
 
 void Resource::checkNotify()
@@ -560,7 +543,6 @@ void Resource::setRevalidatingRequest(const ResourceRequest& request)
 
 void Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
 {
-    newRequest.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredCredentials);
     m_redirectChain.append(RedirectPair(newRequest, redirectResponse));
 }