Refactoring starting a resource load

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 99 matching lines @@
 {
     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);
     FetchRequest fetchRequest = FetchRequest(ResourceRequest(secureURL), FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequest, TestResourceFactory());
     EXPECT_EQ(resource, static_cast<Resource*>(nullptr));
     EXPECT_EQ(memoryCache()->resourceForURL(secureURL), static_cast<Resource*>(nullptr));
 
-    // Try calling Resource::load directly. This shouldn't crash.
-    Resource* resource2 = Resource::create(secureURL, Resource::Raw);
-    resource2->load(fetcher);
+    // Start by calling startLoad() directly, rather than via requestResource().
+    // This shouldn't crash.
+    fetcher->startLoad(Resource::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;
@@ skipping 153 matching lines @@
     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));
     ASSERT_TRUE(resource1);
-    resource1->load(fetcher);
+    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));
     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));
     ASSERT_TRUE(resource3);
     EXPECT_EQ(resource2, resource3);
     EXPECT_TRUE(resource3->isCacheValidator());
     EXPECT_TRUE(resource3->stillNeedsLoad());
 
-    // load() can be called from any initiator. Here, call it from the latter.
-    resource3->load(fetcher);
+    // 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)
@@ skipping 48 matching lines @@
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Raw));
     Persistent<ServeRequestsOnCompleteClient> client = new ServeRequestsOnCompleteClient();
     resource->addClient(client);
     resource->loader()->cancel();
     resource->removeClient(client);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
 } // namespace blink