Remove WebURLLoader* argument from WebURLLoaderClient methods

third_party/WebKit/Source/core/fetch/ImageResourceTest.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 221 matching lines @@
       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 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);
+      WrappedResourceResponse(multipartResponse), nullptr);
   EXPECT_FALSE(cachedImage->resourceBuffer());
   EXPECT_FALSE(cachedImage->hasImage());
   EXPECT_EQ(0, client->imageChangedCount());
   EXPECT_FALSE(client->notifyFinishedCalled());
   EXPECT_EQ("multipart/x-mixed-replace", cachedImage->response().mimeType());
 
   const char firstPart[] =
       "--boundary\n"
       "Content-Type: image/svg+xml\n\n";
   cachedImage->appendData(firstPart, strlen(firstPart));
@@ skipping 23 matching lines @@
   EXPECT_EQ(0, client2->imageChangedCount());
   EXPECT_FALSE(client2->notifyFinishedCalled());
 
   const char thirdPart[] = "--boundary";
   cachedImage->appendData(thirdPart, strlen(thirdPart));
   ASSERT_TRUE(cachedImage->resourceBuffer());
   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, 0);
+  cachedImage->loader()->didFinishLoading(0.0, 0, 0);
   EXPECT_TRUE(cachedImage->resourceBuffer());
   EXPECT_FALSE(cachedImage->errorOccurred());
   ASSERT_TRUE(cachedImage->hasImage());
   EXPECT_FALSE(cachedImage->getImage()->isNull());
   EXPECT_EQ(1, cachedImage->getImage()->width());
   EXPECT_EQ(1, cachedImage->getImage()->height());
   EXPECT_EQ(1, client->imageChangedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(1, client2->imageChangedCount());
   EXPECT_TRUE(client2->notifyFinishedCalled());
@@ skipping 134 matching lines @@
   EXPECT_EQ(1, cachedImage->getImage()->height());
 
   // Call reloadIfLoFiOrPlaceholder() after the image has finished loading.
   cachedImage->reloadIfLoFiOrPlaceholder(fetcher);
   EXPECT_FALSE(cachedImage->errorOccurred());
   EXPECT_FALSE(cachedImage->resourceBuffer());
   EXPECT_FALSE(cachedImage->hasImage());
   EXPECT_EQ(3, client->imageChangedCount());
 
   cachedImage->loader()->didReceiveResponse(
-      nullptr, WrappedResourceResponse(resourceResponse), nullptr);
+      WrappedResourceResponse(resourceResponse), nullptr);
   cachedImage->loader()->didReceiveData(
-      nullptr, reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
+      reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
       sizeof(kJpegImage2));
-  cachedImage->loader()->didFinishLoading(nullptr, 0.0, sizeof(kJpegImage2),
+  cachedImage->loader()->didFinishLoading(0.0, sizeof(kJpegImage2),
                                           sizeof(kJpegImage2));
   EXPECT_FALSE(cachedImage->errorOccurred());
   ASSERT_TRUE(cachedImage->hasImage());
   EXPECT_FALSE(cachedImage->getImage()->isNull());
   EXPECT_EQ(sizeof(kJpegImage2), client->encodedSizeOnLastImageChanged());
   EXPECT_TRUE(client->notifyFinishedCalled());
   // The client should not have been notified of completion again.
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnImageNotifyFinished());
   EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
@@ skipping 14 matching lines @@
   ImageResource* cachedImage = ImageResource::fetch(fetchRequest, fetcher);
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(cachedImage);
 
   // Send the image response.
   ResourceResponse initialResourceResponse(
       testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String());
   initialResourceResponse.addHTTPHeaderField("chrome-proxy", "q=low");
 
   cachedImage->loader()->didReceiveResponse(
-      nullptr, WrappedResourceResponse(initialResourceResponse));
+      WrappedResourceResponse(initialResourceResponse));
   cachedImage->loader()->didReceiveData(
-      nullptr, reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage),
+      reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage),
       sizeof(kJpegImage));
 
   EXPECT_FALSE(cachedImage->errorOccurred());
   ASSERT_TRUE(cachedImage->hasImage());
   EXPECT_FALSE(cachedImage->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnLastImageChanged());
   EXPECT_FALSE(client->notifyFinishedCalled());
   EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
   EXPECT_EQ(1, cachedImage->getImage()->width());
   EXPECT_EQ(1, cachedImage->getImage()->height());
 
   // Call reloadIfLoFiOrPlaceholder() while the image is still loading.
   cachedImage->reloadIfLoFiOrPlaceholder(fetcher);
   EXPECT_FALSE(cachedImage->errorOccurred());
   EXPECT_FALSE(cachedImage->resourceBuffer());
   EXPECT_FALSE(cachedImage->hasImage());
   EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_EQ(0U, client->encodedSizeOnLastImageChanged());
   // The client should not have been notified of completion yet, since the image
   // is still loading.
   EXPECT_FALSE(client->notifyFinishedCalled());
 
   cachedImage->loader()->didReceiveResponse(
-      nullptr,
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kJpegImage2), nullAtom, String())),
       nullptr);
   cachedImage->loader()->didReceiveData(
-      nullptr, reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
+      reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
       sizeof(kJpegImage2));
-  cachedImage->loader()->didFinishLoading(nullptr, 0.0, sizeof(kJpegImage2),
+  cachedImage->loader()->didFinishLoading(0.0, sizeof(kJpegImage2),
                                           sizeof(kJpegImage2));
 
   EXPECT_FALSE(cachedImage->errorOccurred());
   ASSERT_TRUE(cachedImage->hasImage());
   EXPECT_FALSE(cachedImage->getImage()->isNull());
   EXPECT_EQ(sizeof(kJpegImage2), client->encodedSizeOnLastImageChanged());
   // The client should have been notified of completion only after the reload
   // completed.
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(sizeof(kJpegImage2), client->encodedSizeOnNotifyFinished());
@@ skipping 18 matching lines @@
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(image);
 
   ResourceResponse response(testURL, "image/jpeg",
                             kJpegImageSubrangeWithDimensionsLength, nullAtom,
                             String());
   response.setHTTPStatusCode(206);
   response.setHTTPHeaderField(
       "content-range", buildContentRange(kJpegImageSubrangeWithDimensionsLength,
                                          sizeof(kJpegImage)));
-  image->loader()->didReceiveResponse(nullptr,
-                                      WrappedResourceResponse(response));
-  image->loader()->didReceiveData(nullptr,
-                                  reinterpret_cast<const char*>(kJpegImage),
+  image->loader()->didReceiveResponse(WrappedResourceResponse(response));
+  image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
                                   kJpegImageSubrangeWithDimensionsLength,
                                   kJpegImageSubrangeWithDimensionsLength);
-  image->loader()->didFinishLoading(nullptr, 0.0,
-                                    kJpegImageSubrangeWithDimensionsLength,
+  image->loader()->didFinishLoading(0.0, kJpegImageSubrangeWithDimensionsLength,
                                     kJpegImageSubrangeWithDimensionsLength);
 
   EXPECT_EQ(Resource::Cached, image->getStatus());
   EXPECT_TRUE(image->isPlaceholder());
 
   image->reloadIfLoFiOrPlaceholder(fetcher);
 
   EXPECT_EQ(Resource::Pending, image->getStatus());
   EXPECT_FALSE(image->isPlaceholder());
   EXPECT_EQ(nullAtom, image->resourceRequest().httpHeaderField("range"));
@@ skipping 265 matching lines @@
 TEST(ImageResourceTest, CancelOnDecodeError) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
   FetchRequest request(testURL, FetchInitiatorInfo());
   ImageResource* cachedImage = ImageResource::fetch(request, fetcher);
 
   cachedImage->loader()->didReceiveResponse(
-      nullptr, WrappedResourceResponse(ResourceResponse(
-                   testURL, "image/jpeg", 18, nullAtom, String())),
+      WrappedResourceResponse(
+          ResourceResponse(testURL, "image/jpeg", 18, nullAtom, String())),
       nullptr);
-  cachedImage->loader()->didReceiveData(nullptr, "notactuallyanimage", 18, 18);
+  cachedImage->loader()->didReceiveData("notactuallyanimage", 18, 18);
   EXPECT_EQ(Resource::DecodeError, cachedImage->getStatus());
   EXPECT_FALSE(cachedImage->isLoading());
 }
 
 TEST(ImageResourceTest, FetchDisallowPlaceholder) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
   FetchRequest request(testURL, FetchInitiatorInfo());
   ImageResource* image = ImageResource::fetch(
       request,
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create()));
   EXPECT_EQ(FetchRequest::DisallowPlaceholder,
             request.placeholderImageRequestType());
   EXPECT_EQ(nullAtom, image->resourceRequest().httpHeaderField("range"));
   EXPECT_FALSE(image->isPlaceholder());
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(image);
 
   image->loader()->didReceiveResponse(
-      nullptr,
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String())));
-  image->loader()->didReceiveData(nullptr,
-                                  reinterpret_cast<const char*>(kJpegImage),
+  image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
                                   sizeof(kJpegImage), sizeof(kJpegImage));
-  image->loader()->didFinishLoading(nullptr, 0.0, sizeof(kJpegImage),
+  image->loader()->didFinishLoading(0.0, sizeof(kJpegImage),
                                     sizeof(kJpegImage));
 
   EXPECT_EQ(Resource::Cached, image->getStatus());
   EXPECT_EQ(sizeof(kJpegImage), image->encodedSize());
   EXPECT_FALSE(image->isPlaceholder());
   EXPECT_LT(0, client->imageChangedCount());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnLastImageChanged());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnImageNotifyFinished());
@@ skipping 72 matching lines @@
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(image);
 
   ResourceResponse response(testURL, "image/jpeg",
                             kJpegImageSubrangeWithDimensionsLength, nullAtom,
                             String());
   response.setHTTPStatusCode(206);
   response.setHTTPHeaderField(
       "content-range", buildContentRange(kJpegImageSubrangeWithDimensionsLength,
                                          sizeof(kJpegImage)));
-  image->loader()->didReceiveResponse(nullptr,
-                                      WrappedResourceResponse(response));
-  image->loader()->didReceiveData(nullptr,
-                                  reinterpret_cast<const char*>(kJpegImage),
+  image->loader()->didReceiveResponse(WrappedResourceResponse(response));
+  image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
                                   kJpegImageSubrangeWithDimensionsLength,
                                   kJpegImageSubrangeWithDimensionsLength);
-  image->loader()->didFinishLoading(nullptr, 0.0,
-                                    kJpegImageSubrangeWithDimensionsLength,
+  image->loader()->didFinishLoading(0.0, kJpegImageSubrangeWithDimensionsLength,
                                     kJpegImageSubrangeWithDimensionsLength);
 
   EXPECT_EQ(Resource::Cached, image->getStatus());
   EXPECT_EQ(kJpegImageSubrangeWithDimensionsLength, image->encodedSize());
   EXPECT_TRUE(image->isPlaceholder());
   EXPECT_LT(0, client->imageChangedCount());
   EXPECT_EQ(kJpegImageSubrangeWithDimensionsLength,
             client->encodedSizeOnLastImageChanged());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(kJpegImageSubrangeWithDimensionsLength,
@@ skipping 20 matching lines @@
   EXPECT_EQ(FetchRequest::AllowPlaceholder,
             request.placeholderImageRequestType());
   EXPECT_EQ("bytes=0-2047", image->resourceRequest().httpHeaderField("range"));
   EXPECT_TRUE(image->isPlaceholder());
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(image);
 
   const char kBadData[] = "notanimageresponse";
 
   image->loader()->didReceiveResponse(
-      nullptr,
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kBadData), nullAtom, String())));
-  image->loader()->didReceiveData(nullptr, kBadData, sizeof(kBadData),
-                                  sizeof(kBadData));
+  image->loader()->didReceiveData(kBadData, sizeof(kBadData), sizeof(kBadData));
 
   // The dimensions could not be extracted, so the full original image should be
   // loading.
   EXPECT_EQ(Resource::Pending, image->getStatus());
   EXPECT_FALSE(image->isPlaceholder());
   EXPECT_EQ(nullAtom, image->resourceRequest().httpHeaderField("range"));
   EXPECT_EQ(static_cast<int>(WebCachePolicy::BypassingCache),
             static_cast<int>(image->resourceRequest().getCachePolicy()));
   EXPECT_FALSE(client->notifyFinishedCalled());
 
   image->loader()->didReceiveResponse(
-      nullptr,
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String())));
-  image->loader()->didReceiveData(nullptr,
-                                  reinterpret_cast<const char*>(kJpegImage),
+  image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
                                   sizeof(kJpegImage), sizeof(kJpegImage));
-  image->loader()->didFinishLoading(nullptr, 0.0, sizeof(kJpegImage),
+  image->loader()->didFinishLoading(0.0, sizeof(kJpegImage),
                                     sizeof(kJpegImage));
 
   EXPECT_EQ(Resource::Cached, image->getStatus());
   EXPECT_EQ(sizeof(kJpegImage), image->encodedSize());
   EXPECT_FALSE(image->isPlaceholder());
   EXPECT_LT(0, client->imageChangedCount());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnLastImageChanged());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnImageNotifyFinished());
@@ skipping 43 matching lines @@
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(image);
 
   ResourceResponse response(testURL, "image/jpeg",
                             kJpegImageSubrangeWithDimensionsLength, nullAtom,
                             String());
   response.setHTTPStatusCode(206);
   response.setHTTPHeaderField(
       "content-range", buildContentRange(kJpegImageSubrangeWithDimensionsLength,
                                          sizeof(kJpegImage)));
-  image->loader()->didReceiveResponse(nullptr,
-                                      WrappedResourceResponse(response));
-  image->loader()->didReceiveData(nullptr,
-                                  reinterpret_cast<const char*>(kJpegImage),
+  image->loader()->didReceiveResponse(WrappedResourceResponse(response));
+  image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
                                   kJpegImageSubrangeWithDimensionsLength,
                                   kJpegImageSubrangeWithDimensionsLength);
-  image->loader()->didFinishLoading(nullptr, 0.0,
-                                    kJpegImageSubrangeWithDimensionsLength,
+  image->loader()->didFinishLoading(0.0, kJpegImageSubrangeWithDimensionsLength,
                                     kJpegImageSubrangeWithDimensionsLength);
 
   EXPECT_EQ(Resource::Cached, image->getStatus());
   EXPECT_EQ(kJpegImageSubrangeWithDimensionsLength, image->encodedSize());
   EXPECT_TRUE(image->isPlaceholder());
   EXPECT_LT(0, client->imageChangedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
 
   FetchRequest nonPlaceholderRequest(testURL, FetchInitiatorInfo());
   ImageResource* secondImage =
@@ skipping 89 matching lines @@
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
   EXPECT_EQ(50, cachedImage->getImage()->width());
   EXPECT_EQ(50, cachedImage->getImage()->height());
 
   WTF::setTimeFunctionsForTesting(nullptr);
 }
 
 }  // namespace
 }  // namespace blink