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 2fae09735592bb16a1dcc583577eb81d95dda419..059eab16ed5027dcb448bdc2ac27844f7657b52d 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;
@@ -792,19 +792,6 @@ void ResourceFetcher::garbageCollectDocumentResources()
     m_documentResources.removeAll(resourcesToDelete);
 }
 
-void ResourceFetcher::notifyLoadedFromMemoryCache(Resource* resource)
-{
-    if (resource->status() != Resource::Cached || m_validatedURLs.contains(resource->url()))
-        return;
-

[Nate Chapin, 2015/08/21 18:06:26]

The logic below this point moved to FrameFetchContext.cpp

-    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;