Drop ResourceLoader

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

Index: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
index 1815328a24d6a0f9b4fd730bc7b10b6b36bcfe04..409d86d2364ee32027549bcd7663561c3c85e7d9 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
@@ -33,7 +33,6 @@
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/MockResourceClients.h"
 #include "core/fetch/ResourceFetcher.h"
-#include "core/fetch/ResourceLoader.h"
 #include "core/fetch/UniqueIdentifier.h"
 #include "platform/SharedBuffer.h"
 #include "platform/exported/WrappedResourceResponse.h"
@@ -188,19 +187,20 @@ TEST(ImageResourceTest, MultipartImage)
     cachedImage->setIdentifier(createUniqueIdentifier());
     fetcher->startLoad(cachedImage);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(testURL);
+    WebURLLoader* loader = fetcher->loaderForResource(cachedImage);
 
     Persistent<MockImageResourceClient> client = new MockImageResourceClient(cachedImage);
     EXPECT_EQ(Resource::Pending, cachedImage->getStatus());
 
     // Send the multipart response. No image or data buffer is created.
-    // Note that the response must be routed through ResourceLoader to
+    // Note that the response must be routed through ResourceFetcher to
     // ensure the load is flagged as multipart.
     ResourceResponse multipartResponse(KURL(), "multipart/x-mixed-replace", 0, nullAtom, String());
     multipartResponse.setMultipartBoundary("boundary", strlen("boundary"));
-    cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(multipartResponse), nullptr);
+    fetcher->didReceiveResponse(loader, WrappedResourceResponse(multipartResponse), nullptr);
     EXPECT_FALSE(cachedImage->resourceBuffer());
     EXPECT_FALSE(cachedImage->hasImage());
-    EXPECT_EQ(0, client->imageChangedCount());
+    EXPECT_EQ(client->imageChangedCount(), 0);
     EXPECT_FALSE(client->notifyFinishedCalled());
     EXPECT_EQ("multipart/x-mixed-replace", cachedImage->response().mimeType());
 
@@ -235,7 +235,7 @@ TEST(ImageResourceTest, MultipartImage)
     EXPECT_EQ(strlen(secondPart) - 1, cachedImage->resourceBuffer()->size());
 
     // This part finishes. The image is created, callbacks are sent, and the data buffer is cleared.
-    cachedImage->loader()->didFinishLoading(nullptr, 0.0, 0);
+    fetcher->didFinishLoading(loader, 0.0, 0);
     EXPECT_TRUE(cachedImage->resourceBuffer());
     EXPECT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
@@ -369,9 +369,10 @@ TEST(ImageResourceTest, ReloadIfLoFi)
     EXPECT_EQ(3, client->imageChangedCount());
 
     Vector<unsigned char> jpeg2 = jpegImage2();
-    cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(resourceResponse), nullptr);
-    cachedImage->loader()->didReceiveData(nullptr, reinterpret_cast<const char*>(jpeg2.data()), jpeg2.size(), jpeg2.size(), jpeg2.size());
-    cachedImage->loader()->didFinishLoading(nullptr, 0.0, jpeg2.size());
+    WebURLLoader* loader = fetcher->loaderForResource(cachedImage);
+    fetcher->didReceiveResponse(loader, WrappedResourceResponse(resourceResponse), nullptr);
+    fetcher->didReceiveData(loader, reinterpret_cast<const char*>(jpeg2.data()), jpeg2.size(), jpeg2.size(), jpeg2.size());
+    fetcher->didFinishLoading(loader, 0.0, jpeg2.size());
     EXPECT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     EXPECT_FALSE(cachedImage->getImage()->isNull());
@@ -631,8 +632,9 @@ TEST(ImageResourceTest, CancelOnDecodeError)
     ImageResource* cachedImage = ImageResource::fetch(request, fetcher);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(testURL);
 
-    cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(ResourceResponse(testURL, "image/jpeg", 18, nullAtom, String())), nullptr);
-    cachedImage->loader()->didReceiveData(nullptr, "notactuallyanimage", 18, 18, 18);
+    WebURLLoader* loader = fetcher->loaderForResource(cachedImage);
+    fetcher->didReceiveResponse(loader, WrappedResourceResponse(ResourceResponse(testURL, "image/jpeg", 18, nullAtom, String())), nullptr);
+    fetcher->didReceiveData(loader, "notactuallyanimage", 18, 18, 18);
     EXPECT_EQ(Resource::DecodeError, cachedImage->getStatus());
     EXPECT_FALSE(cachedImage->isLoading());
 }