Remove Resource::create() to ensure proper subclasses of Resource are created

third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

 /*
  * Copyright (c) 2013, 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/fetch/ResourceFetcher.h"
 
 #include "core/fetch/FetchInitiatorInfo.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fetch/FetchRequest.h"
+#include "core/fetch/FontResource.h"
+#include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/MockResourceClients.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceLoader.h"
 #include "platform/exported/WrappedResourceResponse.h"
 #include "platform/heap/Handle.h"
 #include "platform/heap/HeapAllocator.h"
 #include "platform/heap/Member.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceTimingInfo.h"
@@ skipping 59 matching lines @@
         m_transferSize(-1) {}
 
   CachePolicy m_policy;
   std::unique_ptr<scheduler::FakeWebTaskRunner> m_runner;
   bool m_complete;
   long long m_transferSize;
 };
 
 class ResourceFetcherTest : public ::testing::Test {};
 
-class TestResourceFactory : public ResourceFactory {
- public:
-  explicit TestResourceFactory(Resource::Type type = Resource::Raw)
-      : ResourceFactory(type) {}
-
-  Resource* create(const ResourceRequest& request,
-                   const ResourceLoaderOptions& options,
-                   const String& charset) const override {
-    return Resource::create(request, type(), options);
-  }
-};
-
 TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach) {
   KURL secureURL(ParsedURLString, "https://secureorigin.test/image.png");
   // Try to request a url. The request should fail, no resource should be
   // returned, and no resource should be present in the cache.
   ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);
+  ResourceRequest resourceRequest(secureURL);
+  resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
   FetchRequest fetchRequest =
-      FetchRequest(ResourceRequest(secureURL), FetchInitiatorInfo());
-  Resource* resource =
-      fetcher->requestResource(fetchRequest, TestResourceFactory());
+      FetchRequest(resourceRequest, FetchInitiatorInfo());
+  Resource* resource = RawResource::fetch(fetchRequest, fetcher);
   EXPECT_FALSE(resource);
   EXPECT_FALSE(memoryCache()->resourceForURL(secureURL));
 
   // Start by calling startLoad() directly, rather than via requestResource().
   // This shouldn't crash.
-  fetcher->startLoad(Resource::create(secureURL, Resource::Raw));
+  fetcher->startLoad(RawResource::create(secureURL, Resource::Raw));
 }
 
 TEST_F(ResourceFetcherTest, UseExistingResource) {
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
 
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
-  Resource* resource = Resource::create(url, Resource::Image);
-  memoryCache()->add(resource);
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(200);
   response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
-  resource->responseReceived(response, nullptr);
-  resource->finish();
+  URLTestHelpers::registerMockedURLLoadWithCustomResponse(
+      url, testImageFilename, WebString::fromUTF8(""),

[hiroshige, 2016/10/05 08:03:19]

This is used to set a proper image payload because ImageResource requires the
payload to be decodable.

+      WrappedResourceResponse(response));
 
   FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
-  Resource* newResource = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Image));
+  Resource* resource = ImageResource::fetch(fetchRequest, fetcher);
+  ASSERT_TRUE(resource);
+  Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
+  EXPECT_TRUE(resource->isLoaded());
+  EXPECT_TRUE(memoryCache()->contains(resource));
+
+  Resource* newResource = ImageResource::fetch(fetchRequest, fetcher);
   EXPECT_EQ(resource, newResource);
   memoryCache()->remove(resource);
 }
 
 TEST_F(ResourceFetcherTest, Vary) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
-  Resource* resource = Resource::create(url, Resource::Raw);
+  Resource* resource = RawResource::create(url, Resource::Raw);
   memoryCache()->add(resource);
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(200);
   response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
   response.setHTTPHeaderField(HTTPNames::Vary, "*");
   resource->responseReceived(response, nullptr);
   resource->finish();
   ASSERT_TRUE(resource->hasVaryHeader());
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
-  FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
+  ResourceRequest resourceRequest(url);
+  resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
+  FetchRequest fetchRequest =
+      FetchRequest(resourceRequest, FetchInitiatorInfo());
   Platform::current()->getURLLoaderMockFactory()->registerURL(
       url, WebURLResponse(), "");
-  Resource* newResource =
-      fetcher->requestResource(fetchRequest, TestResourceFactory());
+  Resource* newResource = RawResource::fetch(fetchRequest, fetcher);
   EXPECT_NE(resource, newResource);
   newResource->loader()->cancel();
   memoryCache()->remove(newResource);
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 
   memoryCache()->remove(resource);
 }
 
 TEST_F(ResourceFetcherTest, VaryOnBack) {
   ResourceFetcherTestMockFetchContext* context =
       ResourceFetcherTestMockFetchContext::create();
   context->setCachePolicy(CachePolicyHistoryBuffer);
   ResourceFetcher* fetcher = ResourceFetcher::create(context);
 
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
-  Resource* resource = Resource::create(url, Resource::Raw);
+  Resource* resource = RawResource::create(url, Resource::Raw);
   memoryCache()->add(resource);
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(200);
   response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
   response.setHTTPHeaderField(HTTPNames::Vary, "*");
   resource->responseReceived(response, nullptr);
   resource->finish();
   ASSERT_TRUE(resource->hasVaryHeader());
 
-  FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
-  Resource* newResource =
-      fetcher->requestResource(fetchRequest, TestResourceFactory());
+  ResourceRequest resourceRequest(url);
+  resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
+  FetchRequest fetchRequest =
+      FetchRequest(resourceRequest, FetchInitiatorInfo());
+  Resource* newResource = RawResource::fetch(fetchRequest, fetcher);
   EXPECT_EQ(resource, newResource);
 
   memoryCache()->remove(newResource);
 }
 
 TEST_F(ResourceFetcherTest, VaryImage) {
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
 
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(200);
   response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
   response.setHTTPHeaderField(HTTPNames::Vary, "*");
   URLTestHelpers::registerMockedURLLoadWithCustomResponse(
       url, testImageFilename, WebString::fromUTF8(""),
       WrappedResourceResponse(response));
 
   FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo());
-  Resource* resource = fetcher->requestResource(
-      fetchRequestOriginal, TestResourceFactory(Resource::Image));
+  Resource* resource = ImageResource::fetch(fetchRequestOriginal, fetcher);
   ASSERT_TRUE(resource);
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   ASSERT_TRUE(resource->hasVaryHeader());
 
   FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
-  Resource* newResource = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Image));
+  Resource* newResource = ImageResource::fetch(fetchRequest, fetcher);
   EXPECT_EQ(resource, newResource);
 
   memoryCache()->remove(newResource);
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
 class RequestSameResourceOnComplete
     : public GarbageCollectedFinalized<RequestSameResourceOnComplete>,
       public RawResourceClient {
   USING_GARBAGE_COLLECTED_MIXIN(RequestSameResourceOnComplete);
 
  public:
   explicit RequestSameResourceOnComplete(Resource* resource)
       : m_resource(resource), m_notifyFinishedCalled(false) {}
 
   void notifyFinished(Resource* resource) override {
     EXPECT_EQ(m_resource, resource);
     ResourceFetcherTestMockFetchContext* context =
         ResourceFetcherTestMockFetchContext::create();
     context->setCachePolicy(CachePolicyRevalidate);
     ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
     FetchRequest fetchRequest2(m_resource->url(), FetchInitiatorInfo());
-    Resource* resource2 = fetcher2->requestResource(
-        fetchRequest2, TestResourceFactory(Resource::Image));
+    Resource* resource2 = ImageResource::fetch(fetchRequest2, fetcher2);
     EXPECT_EQ(m_resource, resource2);
     m_notifyFinishedCalled = true;
   }
   bool notifyFinishedCalled() const { return m_notifyFinishedCalled; }
 
   DEFINE_INLINE_TRACE() {
     visitor->trace(m_resource);
     RawResourceClient::trace(visitor);
   }
 
   String debugName() const override { return "RequestSameResourceOnComplete"; }
 
  private:
   Member<Resource> m_resource;
   bool m_notifyFinishedCalled;
 };
 
 TEST_F(ResourceFetcherTest, RevalidateWhileFinishingLoading) {
-  KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
+  KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.png");
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(200);
   response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
   response.setHTTPHeaderField(HTTPNames::ETag, "1234567890");
-  Platform::current()->getURLLoaderMockFactory()->registerURL(
-      url, WrappedResourceResponse(response), "");
-
+  URLTestHelpers::registerMockedURLLoadWithCustomResponse(
+      url, testImageFilename, WebString::fromUTF8(""),

[hiroshige, 2016/10/05 08:03:19]

ditto.

+      WrappedResourceResponse(response));
   ResourceFetcher* fetcher1 =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
   ResourceRequest request1(url);
   request1.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");
   FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo());
-  Resource* resource1 = fetcher1->requestResource(
-      fetchRequest1, TestResourceFactory(Resource::Image));
+  Resource* resource1 = ImageResource::fetch(fetchRequest1, fetcher1);
   Persistent<RequestSameResourceOnComplete> client =
       new RequestSameResourceOnComplete(resource1);
   resource1->addClient(client);
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
   EXPECT_TRUE(client->notifyFinishedCalled());
   resource1->removeClient(client);
   memoryCache()->remove(resource1);
 }
 
 TEST_F(ResourceFetcherTest, RevalidateDeferedResourceFromTwoInitiators) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/font.woff");
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(200);
   response.setHTTPHeaderField(HTTPNames::ETag, "1234567890");
   Platform::current()->getURLLoaderMockFactory()->registerURL(
       url, WrappedResourceResponse(response), "");
 
   ResourceFetcherTestMockFetchContext* context =
       ResourceFetcherTestMockFetchContext::create();
   ResourceFetcher* fetcher = ResourceFetcher::create(context);
 
   // Fetch to cache a resource.
   ResourceRequest request1(url);
   FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo());
-  Resource* resource1 = fetcher->requestResource(
-      fetchRequest1, TestResourceFactory(Resource::Font));
+  Resource* resource1 = FontResource::fetch(fetchRequest1, fetcher);
   ASSERT_TRUE(resource1);
   fetcher->startLoad(resource1);
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   EXPECT_TRUE(resource1->isLoaded());
   EXPECT_FALSE(resource1->errorOccurred());
 
   // Set the context as it is on reloads.
   context->setLoadComplete(true);
   context->setCachePolicy(CachePolicyRevalidate);
 
   // Revalidate the resource.
   ResourceRequest request2(url);
   FetchRequest fetchRequest2 = FetchRequest(request2, FetchInitiatorInfo());
-  Resource* resource2 = fetcher->requestResource(
-      fetchRequest2, TestResourceFactory(Resource::Font));
+  Resource* resource2 = FontResource::fetch(fetchRequest2, fetcher);
   ASSERT_TRUE(resource2);
   EXPECT_EQ(resource1, resource2);
   EXPECT_TRUE(resource2->isCacheValidator());
   EXPECT_TRUE(resource2->stillNeedsLoad());
 
   // Fetch the same resource again before actual load operation starts.
   ResourceRequest request3(url);
   FetchRequest fetchRequest3 = FetchRequest(request3, FetchInitiatorInfo());
-  Resource* resource3 = fetcher->requestResource(
-      fetchRequest3, TestResourceFactory(Resource::Font));
+  Resource* resource3 = FontResource::fetch(fetchRequest3, fetcher);
   ASSERT_TRUE(resource3);
   EXPECT_EQ(resource2, resource3);
   EXPECT_TRUE(resource3->isCacheValidator());
   EXPECT_TRUE(resource3->stillNeedsLoad());
 
   // startLoad() can be called from any initiator. Here, call it from the
   // latter.
   fetcher->startLoad(resource3);
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   EXPECT_TRUE(resource3->isLoaded());
   EXPECT_FALSE(resource3->errorOccurred());
   EXPECT_TRUE(resource2->isLoaded());
   EXPECT_FALSE(resource2->errorOccurred());
 
   memoryCache()->remove(resource1);
 }
 
 TEST_F(ResourceFetcherTest, DontReuseMediaDataUrl) {
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
   ResourceRequest request(KURL(ParsedURLString, "data:text/html,foo"));
+  request.setRequestContext(WebURLRequest::RequestContextVideo);
   ResourceLoaderOptions options;
   options.dataBufferingPolicy = DoNotBufferData;
   FetchRequest fetchRequest =
       FetchRequest(request, FetchInitiatorTypeNames::internal, options);
-  Resource* resource1 = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Media));
-  Resource* resource2 = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Media));
+  Resource* resource1 = RawResource::fetchMedia(fetchRequest, fetcher);
+  Resource* resource2 = RawResource::fetchMedia(fetchRequest, fetcher);
   EXPECT_NE(resource1, resource2);
   memoryCache()->remove(resource2);
 }
 
 class ServeRequestsOnCompleteClient final
     : public GarbageCollectedFinalized<ServeRequestsOnCompleteClient>,
       public RawResourceClient {
   USING_GARBAGE_COLLECTED_MIXIN(ServeRequestsOnCompleteClient);
 
  public:
@@ skipping 36 matching lines @@
 // This emulates a modal dialog triggering a nested run loop inside
 // ResourceLoader::cancel(). If the ResourceLoader doesn't promptly cancel its
 // WebURLLoader before notifying its clients, a nested run loop  may send a
 // network response, leading to an invalid state transition in ResourceLoader.
 TEST_F(ResourceFetcherTest, ResponseOnCancel) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.png");
   URLTestHelpers::registerMockedURLLoad(url, testImageFilename, "image/png");
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
-  FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
-  Resource* resource = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Raw));
+  ResourceRequest resourceRequest(url);
+  resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
+  FetchRequest fetchRequest =
+      FetchRequest(resourceRequest, FetchInitiatorInfo());
+  Resource* resource = RawResource::fetch(fetchRequest, fetcher);
   Persistent<ServeRequestsOnCompleteClient> client =
       new ServeRequestsOnCompleteClient();
   resource->addClient(client);
   resource->loader()->cancel();
   resource->removeClient(client);
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
 class ScopedMockRedirectRequester {
   STACK_ALLOCATED();
@@ skipping 17 matching lines @@
 
   void registerFinalResource(const WebString& url) {
     KURL finalURL(ParsedURLString, url);
     URLTestHelpers::registerMockedURLLoad(finalURL, testImageFilename);
   }
 
   void request(const WebString& url) {
     DCHECK(!m_context);
     m_context = ResourceFetcherTestMockFetchContext::create();
     ResourceFetcher* fetcher = ResourceFetcher::create(m_context);
+    ResourceRequest resourceRequest(url);
+    resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
     FetchRequest fetchRequest =
-        FetchRequest(ResourceRequest(url), FetchInitiatorInfo());
-    fetcher->requestResource(fetchRequest, TestResourceFactory());
+        FetchRequest(resourceRequest, FetchInitiatorInfo());
+    RawResource::fetch(fetchRequest, fetcher);
     Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   }
 
   void cleanUp() {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     memoryCache()->evictResources();
   }
 
   ResourceFetcherTestMockFetchContext* context() const { return m_context; }
 
@@ skipping 38 matching lines @@
 
   EXPECT_EQ(testImageSize, requester.context()->getTransferSize());
 }
 
 TEST_F(ResourceFetcherTest, SynchronousRequest) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.png");
   URLTestHelpers::registerMockedURLLoad(url, testImageFilename, "image/png");
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
-  FetchRequest request(url, FetchInitiatorInfo());
-  request.makeSynchronous();
-  Resource* resource = fetcher->requestResource(request, TestResourceFactory());
+  ResourceRequest resourceRequest(url);
+  resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
+  FetchRequest fetchRequest(resourceRequest, FetchInitiatorInfo());
+  fetchRequest.makeSynchronous();
+  Resource* resource = RawResource::fetch(fetchRequest, fetcher);
   EXPECT_TRUE(resource->isLoaded());
   EXPECT_EQ(ResourceLoadPriorityHighest,
             resource->resourceRequest().priority());
 
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
   memoryCache()->remove(resource);
 }
 
 TEST_F(ResourceFetcherTest, PreloadImageTwice) {
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
 
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.png");
   URLTestHelpers::registerMockedURLLoad(url, testImageFilename, "image/png");
 
   FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo());
-  Resource* resource = fetcher->requestResource(
-      fetchRequestOriginal, TestResourceFactory(Resource::Image));
+  Resource* resource = ImageResource::fetch(fetchRequestOriginal, fetcher);
   ASSERT_TRUE(resource);
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   fetcher->preloadStarted(resource);
 
   FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
-  Resource* newResource = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Image));
+  Resource* newResource = ImageResource::fetch(fetchRequest, fetcher);
   EXPECT_EQ(resource, newResource);
   fetcher->preloadStarted(resource);
 
   fetcher->clearPreloads(ResourceFetcher::ClearAllPreloads);
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
   EXPECT_FALSE(memoryCache()->contains(resource));
   EXPECT_FALSE(resource->isPreloaded());
 }
 
 TEST_F(ResourceFetcherTest, LinkPreloadImageAndUse) {
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
 
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.png");
   URLTestHelpers::registerMockedURLLoad(url, testImageFilename, "image/png");
 
   // Link preload preload scanner
   FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo());
   fetchRequestOriginal.setLinkPreload(true);
-  Resource* resource = fetcher->requestResource(
-      fetchRequestOriginal, TestResourceFactory(Resource::Image));
+  Resource* resource = ImageResource::fetch(fetchRequestOriginal, fetcher);
   ASSERT_TRUE(resource);
   EXPECT_TRUE(resource->isLinkPreload());
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   fetcher->preloadStarted(resource);
 
   // Image preload scanner
   FetchRequest fetchRequestPreloadScanner =
       FetchRequest(url, FetchInitiatorInfo());
-  Resource* imgPreloadScannerResource = fetcher->requestResource(
-      fetchRequestPreloadScanner, TestResourceFactory(Resource::Image));
+  Resource* imgPreloadScannerResource =
+      ImageResource::fetch(fetchRequestPreloadScanner, fetcher);
   EXPECT_EQ(resource, imgPreloadScannerResource);
   EXPECT_FALSE(resource->isLinkPreload());
   fetcher->preloadStarted(resource);
 
   // Image created by parser
   FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
-  Resource* newResource = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Image));
+  Resource* newResource = ImageResource::fetch(fetchRequest, fetcher);
   Persistent<MockResourceClient> client = new MockResourceClient(newResource);
   EXPECT_EQ(resource, newResource);
   EXPECT_FALSE(resource->isLinkPreload());
 
   // DCL reached
   fetcher->clearPreloads(ResourceFetcher::ClearSpeculativeMarkupPreloads);
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
   EXPECT_TRUE(memoryCache()->contains(resource));
   EXPECT_FALSE(resource->isPreloaded());
 }
 
 TEST_F(ResourceFetcherTest, LinkPreloadImageMultipleFetchersAndUse) {
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
   ResourceFetcher* fetcher2 =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
 
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.png");
   URLTestHelpers::registerMockedURLLoad(url, testImageFilename, "image/png");
 
   FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo());
   fetchRequestOriginal.setLinkPreload(true);
-  Resource* resource = fetcher->requestResource(
-      fetchRequestOriginal, TestResourceFactory(Resource::Image));
+  Resource* resource = ImageResource::fetch(fetchRequestOriginal, fetcher);
   ASSERT_TRUE(resource);
   EXPECT_TRUE(resource->isLinkPreload());
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   fetcher->preloadStarted(resource);
 
   FetchRequest fetchRequestSecond = FetchRequest(url, FetchInitiatorInfo());
   fetchRequestSecond.setLinkPreload(true);
-  Resource* secondResource = fetcher2->requestResource(
-      fetchRequestSecond, TestResourceFactory(Resource::Image));
+  Resource* secondResource = ImageResource::fetch(fetchRequestSecond, fetcher2);
   ASSERT_TRUE(secondResource);
   EXPECT_TRUE(secondResource->isLinkPreload());
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   fetcher2->preloadStarted(secondResource);
 
   // Link rel preload scanner
   FetchRequest fetchRequestLinkPreloadScanner =
       FetchRequest(url, FetchInitiatorInfo());
   fetchRequestLinkPreloadScanner.setLinkPreload(true);
-  Resource* linkPreloadScannerResource = fetcher->requestResource(
-      fetchRequestLinkPreloadScanner, TestResourceFactory(Resource::Image));
+  Resource* linkPreloadScannerResource =
+      ImageResource::fetch(fetchRequestLinkPreloadScanner, fetcher);
   EXPECT_EQ(resource, linkPreloadScannerResource);
   EXPECT_TRUE(resource->isLinkPreload());
   fetcher->preloadStarted(resource);
 
   // Image preload scanner
   FetchRequest fetchRequestPreloadScanner =
       FetchRequest(url, FetchInitiatorInfo());
-  Resource* imgPreloadScannerResource = fetcher->requestResource(
-      fetchRequestPreloadScanner, TestResourceFactory(Resource::Image));
+  Resource* imgPreloadScannerResource =
+      ImageResource::fetch(fetchRequestPreloadScanner, fetcher);
   EXPECT_EQ(resource, imgPreloadScannerResource);
   EXPECT_FALSE(resource->isLinkPreload());
   fetcher->preloadStarted(resource);
 
   // Image preload scanner on the second fetcher
   FetchRequest fetchRequestPreloadScanner2 =
       FetchRequest(url, FetchInitiatorInfo());
-  Resource* imgPreloadScannerResource2 = fetcher2->requestResource(
-      fetchRequestPreloadScanner2, TestResourceFactory(Resource::Image));
+  Resource* imgPreloadScannerResource2 =
+      ImageResource::fetch(fetchRequestPreloadScanner2, fetcher2);
   EXPECT_EQ(resource, imgPreloadScannerResource2);
   EXPECT_FALSE(resource->isLinkPreload());
   fetcher2->preloadStarted(resource);
 
   // Image created by parser
   FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
-  Resource* newResource = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Image));
+  Resource* newResource = ImageResource::fetch(fetchRequest, fetcher);
   Persistent<MockResourceClient> client = new MockResourceClient(newResource);
   EXPECT_EQ(resource, newResource);
   EXPECT_FALSE(resource->isLinkPreload());
 
   // Image created by parser on the second fetcher
   FetchRequest fetchRequest2 = FetchRequest(url, FetchInitiatorInfo());
-  Resource* newResource2 = fetcher2->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Image));
+  Resource* newResource2 = ImageResource::fetch(fetchRequest, fetcher2);
   Persistent<MockResourceClient> client2 = new MockResourceClient(newResource2);
   EXPECT_EQ(resource, newResource2);
   EXPECT_FALSE(resource->isLinkPreload());
   // DCL reached on first fetcher
   EXPECT_TRUE(resource->isPreloaded());
   fetcher->clearPreloads(ResourceFetcher::ClearSpeculativeMarkupPreloads);
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
   EXPECT_TRUE(memoryCache()->contains(resource));
   EXPECT_TRUE(resource->isPreloaded());
 
   // DCL reached on second fetcher
   fetcher2->clearPreloads(ResourceFetcher::ClearSpeculativeMarkupPreloads);
   EXPECT_TRUE(memoryCache()->contains(resource));
   EXPECT_FALSE(resource->isPreloaded());
 }
 
 TEST_F(ResourceFetcherTest, Revalidate304) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
-  Resource* resource = Resource::create(url, Resource::Raw);
+  Resource* resource = RawResource::create(url, Resource::Raw);
   memoryCache()->add(resource);
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(304);
   response.setHTTPHeaderField("etag", "1234567890");
   resource->responseReceived(response, nullptr);
   resource->finish();
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
-  FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
+  ResourceRequest resourceRequest(url);
+  resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
+  FetchRequest fetchRequest =
+      FetchRequest(resourceRequest, FetchInitiatorInfo());
   Platform::current()->getURLLoaderMockFactory()->registerURL(
       url, WebURLResponse(), "");
-  Resource* newResource = fetcher->requestResource(
-      fetchRequest, TestResourceFactory(Resource::Raw));
+  Resource* newResource = RawResource::fetch(fetchRequest, fetcher);
   fetcher->stopFetching();
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 
   EXPECT_NE(resource, newResource);
 }
 
 }  // namespace blink