Pass correct resource type to OnDidLoadResourceFromMemoryCache

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 30 matching lines @@
 #include "core/html/HTMLIFrameElement.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/EmptyClients.h"
 #include "core/page/Page.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebAddressSpace.h"
 #include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebInsecureRequestPolicy.h"
-#include "testing/gmock/include/gmock/gmock-generated-function-mockers.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <memory>
 
 namespace blink {
 
 class StubFrameLoaderClientWithParent final : public EmptyFrameLoaderClient {
  public:
   static StubFrameLoaderClientWithParent* create(Frame* parent) {
     return new StubFrameLoaderClientWithParent(parent);
   }
 
   DEFINE_INLINE_VIRTUAL_TRACE() {
     visitor->trace(m_parent);
     EmptyFrameLoaderClient::trace(visitor);
   }
 
   Frame* parent() const override { return m_parent.get(); }
 
  private:
   explicit StubFrameLoaderClientWithParent(Frame* parent) : m_parent(parent) {}
 
   Member<Frame> m_parent;
 };
 
 class MockFrameLoaderClient : public EmptyFrameLoaderClient {
  public:
   MockFrameLoaderClient() : EmptyFrameLoaderClient() {}
   MOCK_METHOD1(didDisplayContentWithCertificateErrors, void(const KURL&));
+  MOCK_METHOD2(dispatchDidLoadResourceFromMemoryCache,
+               void(const ResourceRequest&, const ResourceResponse&));
 };
 
 class FrameFetchContextTest : public ::testing::Test {
  protected:
   void SetUp() override {
     dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
     dummyPageHolder->page().setDeviceScaleFactor(1.0);
     documentLoader = DocumentLoader::create(
         &dummyPageHolder->frame(), ResourceRequest("http://www.example.com"),
         SubstituteData(), ClientRedirectPolicy::NotClientRedirect);
@@ skipping 40 matching lines @@
   Persistent<Document> document;
   Persistent<FrameFetchContext> fetchContext;
 
   Persistent<StubFrameLoaderClientWithParent> childClient;
   Persistent<LocalFrame> childFrame;
   Persistent<DocumentLoader> childDocumentLoader;
   Persistent<Document> childDocument;
   Persistent<DummyFrameOwner> owner;
 };
 
-// This test class sets up a mock frame loader client that expects a call to
-// didDisplayContentWithCertificateErrors().
-class FrameFetchContextDisplayedCertificateErrorsTest
+// This test class sets up a mock frame loader client.
+class FrameFetchContextMockedFrameLoaderClientTest
     : public FrameFetchContextTest {
  protected:
   void SetUp() override {
     url = KURL(KURL(), "https://example.test/foo");
     mainResourceUrl = KURL(KURL(), "https://www.example.test");
-    MockFrameLoaderClient* client = new MockFrameLoaderClient;
-    EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(url));
+    client = new testing::NiceMock<MockFrameLoaderClient>();
     dummyPageHolder =
         DummyPageHolder::create(IntSize(500, 500), nullptr, client);
     dummyPageHolder->page().setDeviceScaleFactor(1.0);
     documentLoader = DocumentLoader::create(
         &dummyPageHolder->frame(), ResourceRequest(mainResourceUrl),
         SubstituteData(), ClientRedirectPolicy::NotClientRedirect);
     document = &dummyPageHolder->document();
     document->setURL(mainResourceUrl);
     fetchContext =
         static_cast<FrameFetchContext*>(&documentLoader->fetcher()->context());
     owner = DummyFrameOwner::create();
     FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
   }
 
   KURL url;
   KURL mainResourceUrl;
+
+  Persistent<testing::NiceMock<MockFrameLoaderClient>> client;
 };
 
 class FrameFetchContextModifyRequestTest : public FrameFetchContextTest {
  public:
   FrameFetchContextModifyRequestTest()
       : exampleOrigin(SecurityOrigin::create(
             KURL(ParsedURLString, "https://example.test/"))),
         secureOrigin(SecurityOrigin::create(
             KURL(ParsedURLString, "https://secureorigin.test/image.png"))) {}
 
@@ skipping 490 matching lines @@
   fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
   EXPECT_EQ("on", resourceRequest.httpHeaderField("Save-Data"));
 }
 
 TEST_F(FrameFetchContextTest, DisabledDataSaver) {
   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(FrameFetchContextMockedFrameLoaderClientTest,
+       DispatchDidLoadResourceFromMemoryCache) {
+  ResourceRequest resourceRequest(url);
+  Resource* resource = ImageResource::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);
+}
+
 // Tests that when a resource with certificate errors is loaded from the memory
 // cache, the embedder is notified.
-TEST_F(FrameFetchContextDisplayedCertificateErrorsTest,
+TEST_F(FrameFetchContextMockedFrameLoaderClientTest,
        MemoryCacheCertificateError) {
   ResourceRequest resourceRequest(url);
   ResourceResponse response;
   response.setURL(url);
   response.setHasMajorCertificateErrors(true);
   Resource* resource = ImageResource::create(resourceRequest);
   resource->setResponse(response);
+  EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(url));
   fetchContext->dispatchDidLoadResourceFromMemoryCache(
       createUniqueIdentifier(), resource, WebURLRequest::FrameTypeNone,
       WebURLRequest::RequestContextImage);
 }
 
 TEST_F(FrameFetchContextTest, SetIsExternalRequestForPublicDocument) {
   EXPECT_EQ(WebAddressSpacePublic, document->addressSpace());
 
   struct TestCase {
     const char* url;
@@ skipping 110 matching lines @@
     fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
     EXPECT_EQ(test.isExternalExpectation, mainRequest.isExternalRequest());
 
     ResourceRequest subRequest(test.url);
     fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
     EXPECT_EQ(test.isExternalExpectation, subRequest.isExternalRequest());
   }
 }
 
 }  // namespace blink