Refactoring starting a resource load

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

Index: third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
index 06ca29c9f43ce3313c4803cc1e42969d675cb6af..f230f79468db09b9bfb325e9e8896a4a4b87e959 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
@@ -117,9 +117,9 @@ TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach)
     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)
@@ -293,7 +293,7 @@ TEST_F(ResourceFetcherTest, RevalidateDeferedResourceFromTwoInitiators)
     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());
@@ -320,8 +320,8 @@ TEST_F(ResourceFetcherTest, RevalidateDeferedResourceFromTwoInitiators)
     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());