Merge a couple of memory cache hit notifications

Source/core/fetch/ResourceFetcher.cpp

Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 88aecccbca3350ccb443c3ce93c2289520fb7320..c4e60ef6cb0287542634fca608518185c3e21a0c 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -256,8 +256,8 @@ static const int kMaxValidatedURLsSize = 10000;
 
 void ResourceFetcher::requestLoadStarted(Resource* resource, const FetchRequest& request, ResourceLoadStartType type, bool isStaticData)
 {
-    if (type == ResourceLoadingFromCache)
-        notifyLoadedFromMemoryCache(resource);
+    if (type == ResourceLoadingFromCache && resource->status() == Resource::Cached && !m_validatedURLs.contains(resource->url()))
+        context().dispatchDidLoadResourceFromMemoryCache(resource);
 
     if (isStaticData)
         return;
@@ -790,19 +790,6 @@ void ResourceFetcher::garbageCollectDocumentResources()
     m_documentResources.removeAll(resourcesToDelete);
 }
 
-void ResourceFetcher::notifyLoadedFromMemoryCache(Resource* resource)
-{
-    if (resource->status() != Resource::Cached || m_validatedURLs.contains(resource->url()))
-        return;
-
-    ResourceRequest request(resource->url());
-    unsigned long identifier = createUniqueIdentifier();
-    context().dispatchDidLoadResourceFromMemoryCache(request, resource->response());
-    // FIXME: If willSendRequest changes the request, we don't respect it.
-    willSendRequest(identifier, request, ResourceResponse(), resource->options().initiatorInfo);
-    context().sendRemainingDelegateMessages(identifier, resource->response(), resource->encodedSize());
-}
-
 int ResourceFetcher::requestCount() const
 {
     return m_loaders ? m_loaders->size() : 0;