Move subresource archive loading out of ResourceLoader

Source/core/loader/ResourceLoader.cpp

Index: Source/core/loader/ResourceLoader.cpp
diff --git a/Source/core/loader/ResourceLoader.cpp b/Source/core/loader/ResourceLoader.cpp
index b28971a7cb93394eefaa2ce3210a9adff401fe27..5965a4d5a0f3461f521b3c9c687e9227fc7088b9 100644
--- a/Source/core/loader/ResourceLoader.cpp
+++ b/Source/core/loader/ResourceLoader.cpp
@@ -35,14 +35,12 @@
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/UniqueIdentifier.h"
-#include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/loader/cache/CachedResourceLoader.h"
 #include "core/page/Frame.h"
 #include "core/page/Page.h"
 #include "core/platform/Logging.h"
 #include "core/platform/network/ResourceError.h"
 #include "core/platform/network/ResourceHandle.h"
-#include "weborigin/SecurityOrigin.h"
 
 namespace WebCore {
 
@@ -129,7 +127,6 @@ bool ResourceLoader::init(const ResourceRequest& r)
     ASSERT(!m_handle);
     ASSERT(m_request.isNull());
     ASSERT(m_deferredRequest.isNull());
-    ASSERT(!m_documentLoader->isSubstituteLoadPending(this));
     
     ResourceRequest clientRequest(r);
 
@@ -153,11 +150,6 @@ void ResourceLoader::start()
     ASSERT(!m_request.isNull());
     ASSERT(m_deferredRequest.isNull());
 
-    if (m_documentLoader->scheduleArchiveLoad(this, m_request))
-        return;
-
-    m_documentLoader->applicationCacheHost()->willStartLoadingResource(m_request);

[Nate Chapin, 2013/05/22 23:28:46]

This is the last reference to ApplicationCacheHost in ResourceLoader, and it's
trivial to move, so I did that while I was here.

-
     if (m_defersLoading) {
         m_deferredRequest = m_request;
         return;
@@ -248,7 +240,6 @@ void ResourceLoader::cancel(const ResourceError& error)
     if (m_resource->resourceToRevalidate())
         m_resource->revalidationFailed();
 
-    m_documentLoader->cancelPendingSubstituteLoad(this);
     if (m_handle) {
         m_handle->cancel();
         m_handle = 0;