Move FrameFetchContext::dispatchDidLoadResourceFromMemoryCache logic into ResourceFetcher

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 702 matching lines @@
   ResourceRequest resourceRequest("http://www.example.com");
   fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
   EXPECT_EQ(String(), resourceRequest.httpHeaderField("Save-Data"));
 }
 
 // Tests that the embedder gets correct notification when a resource is loaded
 // from the memory cache.
 TEST_F(FrameFetchContextMockedLocalFrameClientTest,
        DispatchDidLoadResourceFromMemoryCache) {
   ResourceRequest resourceRequest(url);
+  resourceRequest.setRequestContext(WebURLRequest::RequestContextImage);
   Resource* resource = MockResource::create(resourceRequest);
   EXPECT_CALL(
       *client,
       dispatchDidLoadResourceFromMemoryCache(
           testing::AllOf(testing::Property(&ResourceRequest::url, url),
                          testing::Property(&ResourceRequest::frameType,
                                            WebURLRequest::FrameTypeNone),
                          testing::Property(&ResourceRequest::requestContext,
                                            WebURLRequest::RequestContextImage)),
           ResourceResponse()));
   fetchContext->dispatchDidLoadResourceFromMemoryCache(
-      createUniqueIdentifier(), resource, WebURLRequest::FrameTypeNone,
-      WebURLRequest::RequestContextImage);
+      createUniqueIdentifier(), resourceRequest, resource->response());
 }
 
 // Tests that when a resource with certificate errors is loaded from the memory
 // cache, the embedder is notified.
 TEST_F(FrameFetchContextMockedLocalFrameClientTest,
        MemoryCacheCertificateError) {
   ResourceRequest resourceRequest(url);
+  resourceRequest.setRequestContext(WebURLRequest::RequestContextImage);
   ResourceResponse response;
   response.setURL(url);
   response.setHasMajorCertificateErrors(true);
   Resource* resource = MockResource::create(resourceRequest);
   resource->setResponse(response);
   EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(url));
   fetchContext->dispatchDidLoadResourceFromMemoryCache(
-      createUniqueIdentifier(), resource, WebURLRequest::FrameTypeNone,
-      WebURLRequest::RequestContextImage);
+      createUniqueIdentifier(), resourceRequest, resource->response());
 }
 
 TEST_F(FrameFetchContextTest, SetIsExternalRequestForPublicDocument) {
   EXPECT_EQ(WebAddressSpacePublic, document->addressSpace());
 
   struct TestCase {
     const char* url;
     bool isExternalExpectation;
   } cases[] = {
       {"data:text/html,whatever", false},  {"file:///etc/passwd", false},
@@ skipping 144 matching lines @@
   setFilterPolicy(WebDocumentSubresourceFilter::WouldDisallow);
 
   EXPECT_EQ(ResourceRequestBlockedReason::None, canRequest());
   EXPECT_EQ(0, getFilteredLoadCallCount());
 
   EXPECT_EQ(ResourceRequestBlockedReason::None, canRequestPreload());
   EXPECT_EQ(0, getFilteredLoadCallCount());
 }
 
 }  // namespace blink