Move synchronously fetching to ResourceFetcher, as well as most of the logic

Source/core/loader/FrameLoader.cpp

Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 6b6b024995051ce2d3770579d9e8d78ab636a502..7478a7cd272e4315f04cf7a5e1d5dd912242eacc 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -783,20 +783,6 @@ void FrameLoader::reportLocalLoadFailed(Frame* frame, const String& url)
     frame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url);
 }
 
-bool FrameLoader::willLoadMediaElementURL(KURL& url)
-{
-    ResourceRequest request(url);
-
-    unsigned long identifier;
-    ResourceError error;
-    requestFromDelegate(request, identifier, error);
-    m_frame->fetchContext().sendRemainingDelegateMessages(m_documentLoader.get(), identifier, ResourceResponse(url, String(), -1, String(), String()), 0, -1, -1, error);
-
-    url = request.url();
-
-    return error.isNull();
-}
-
 void FrameLoader::reload(ReloadPolicy reloadPolicy, const KURL& overrideURL, const String& overrideEncoding)
 {
     DocumentLoader* documentLoader = activeDocumentLoader();
@@ -1258,34 +1244,6 @@ void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest& request, const String&
     request.setHTTPOrigin(origin);
 }
 
-unsigned long FrameLoader::loadResourceSynchronously(const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
-{
-    ASSERT(m_frame->document());
-    String referrer = SecurityPolicy::generateReferrerHeader(m_frame->document()->referrerPolicy(), request.url(), outgoingReferrer());
-
-    ResourceRequest initialRequest = request;
-    initialRequest.setTimeoutInterval(10);
-
-    if (!referrer.isEmpty())
-        initialRequest.setHTTPReferrer(referrer);
-    addHTTPOriginIfNeeded(initialRequest, outgoingOrigin());
-
-    addExtraFieldsToRequest(initialRequest);
-
-    unsigned long identifier = 0;
-    ResourceRequest newRequest(initialRequest);
-    requestFromDelegate(newRequest, identifier, error);
-
-    if (error.isNull()) {
-        ASSERT(!newRequest.isNull());
-        documentLoader()->applicationCacheHost()->willStartLoadingSynchronously(newRequest);
-        ResourceLoader::loadResourceSynchronously(newRequest, storedCredentials, error, response, data);
-    }
-    int encodedDataLength = response.resourceLoadInfo() ? static_cast<int>(response.resourceLoadInfo()->encodedDataLength) : -1;
-    m_frame->fetchContext().sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, data.data(), data.size(), encodedDataLength, error);
-    return identifier;
-}
-
 const ResourceRequest& FrameLoader::originalRequest() const
 {
     return activeDocumentLoader()->originalRequestCopy();
@@ -1506,48 +1464,6 @@ void FrameLoader::checkNewWindowPolicyAndContinue(PassRefPtr<FormState> formStat
     mainFrame->loader()->loadWithNavigationAction(action.resourceRequest(), NavigationAction(action.resourceRequest()), FrameLoadTypeStandard, formState, SubstituteData());
 }
 
-void FrameLoader::requestFromDelegate(ResourceRequest& request, unsigned long& identifier, ResourceError& error)
-{
-    ASSERT(!request.isNull());
-
-    identifier = 0;
-    if (m_frame->page())
-        identifier = createUniqueIdentifier();
-
-    ResourceRequest newRequest(request);
-    m_frame->fetchContext().dispatchWillSendRequest(m_documentLoader.get(), identifier, newRequest, ResourceResponse());
-
-    if (newRequest.isNull())
-        error = ResourceError::cancelledError(request.url());
-    else
-        error = ResourceError();
-
-    request = newRequest;
-}
-
-void FrameLoader::loadedResourceFromMemoryCache(Resource* resource)
-{
-    Page* page = m_frame->page();
-    if (!page)
-        return;
-
-    if (!resource->shouldSendResourceLoadCallbacks())
-        return;
-
-    // Main resource delegate messages are synthesized in MainResourceLoader, so we must not send them here.
-    if (resource->type() == Resource::MainResource)
-        return;
-
-    ResourceRequest request(resource->url());
-    m_client->dispatchDidLoadResourceFromMemoryCache(m_documentLoader.get(), request, resource->response(), resource->encodedSize());
-
-    unsigned long identifier;
-    ResourceError error;
-    requestFromDelegate(request, identifier, error);
-    InspectorInstrumentation::markResourceAsCached(page, identifier);
-    m_frame->fetchContext().sendRemainingDelegateMessages(m_documentLoader.get(), identifier, resource->response(), 0, resource->encodedSize(), 0, error);
-}
-
 void FrameLoader::applyUserAgent(ResourceRequest& request)
 {
     String userAgent = this->userAgent(request.url());