Dispatch encoded_data_length separately in content/child

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 82f6294f2150cf07a21814ee7981e9def4cebaed..c3fcb0bd72924c4d46aa9df292ae87749cfba31d 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
@@ -442,8 +442,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
   cachedImage->loader()->didReceiveResponse(
       WrappedResourceResponse(resourceResponse), nullptr);
   cachedImage->loader()->didReceiveData(
-      reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
-      sizeof(kJpegImage2));
+      reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2));
   cachedImage->loader()->didFinishLoading(0.0, sizeof(kJpegImage2),
                                           sizeof(kJpegImage2));
   EXPECT_FALSE(cachedImage->errorOccurred());
@@ -483,8 +482,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderDuringFetch) {
   cachedImage->loader()->didReceiveResponse(
       WrappedResourceResponse(initialResourceResponse));
   cachedImage->loader()->didReceiveData(
-      reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage),
-      sizeof(kJpegImage));
+      reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage));
 
   EXPECT_FALSE(cachedImage->errorOccurred());
   ASSERT_TRUE(cachedImage->hasImage());
@@ -512,8 +510,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderDuringFetch) {
           testURL, "image/jpeg", sizeof(kJpegImage2), nullAtom, String())),
       nullptr);
   cachedImage->loader()->didReceiveData(
-      reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
-      sizeof(kJpegImage2));
+      reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2));
   cachedImage->loader()->didFinishLoading(0.0, sizeof(kJpegImage2),
                                           sizeof(kJpegImage2));
 
@@ -555,7 +552,6 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderForPlaceholder) {
                                          sizeof(kJpegImage)));
   image->loader()->didReceiveResponse(WrappedResourceResponse(response));
   image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
-                                  kJpegImageSubrangeWithDimensionsLength,
                                   kJpegImageSubrangeWithDimensionsLength);
   image->loader()->didFinishLoading(0.0, kJpegImageSubrangeWithDimensionsLength,
                                     kJpegImageSubrangeWithDimensionsLength);
@@ -858,7 +854,7 @@ TEST(ImageResourceTest, CancelOnDecodeError) {
       WrappedResourceResponse(
           ResourceResponse(testURL, "image/jpeg", 18, nullAtom, String())),
       nullptr);
-  cachedImage->loader()->didReceiveData("notactuallyanimage", 18, 18);
+  cachedImage->loader()->didReceiveData("notactuallyanimage", 18);
   EXPECT_EQ(Resource::DecodeError, cachedImage->getStatus());
   EXPECT_FALSE(cachedImage->isLoading());
 }
@@ -882,7 +878,7 @@ TEST(ImageResourceTest, FetchDisallowPlaceholder) {
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String())));
   image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
-                                  sizeof(kJpegImage), sizeof(kJpegImage));
+                                  sizeof(kJpegImage));
   image->loader()->didFinishLoading(0.0, sizeof(kJpegImage),
                                     sizeof(kJpegImage));
 
@@ -978,7 +974,6 @@ TEST(ImageResourceTest, FetchAllowPlaceholderSuccessful) {
                                          sizeof(kJpegImage)));
   image->loader()->didReceiveResponse(WrappedResourceResponse(response));
   image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
-                                  kJpegImageSubrangeWithDimensionsLength,
                                   kJpegImageSubrangeWithDimensionsLength);
   image->loader()->didFinishLoading(0.0, kJpegImageSubrangeWithDimensionsLength,
                                     kJpegImageSubrangeWithDimensionsLength);
@@ -1023,7 +1018,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
   image->loader()->didReceiveResponse(
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kBadData), nullAtom, String())));
-  image->loader()->didReceiveData(kBadData, sizeof(kBadData), sizeof(kBadData));
+  image->loader()->didReceiveData(kBadData, sizeof(kBadData));
 
   // The dimensions could not be extracted, so the full original image should be
   // loading.
@@ -1039,7 +1034,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String())));
   image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
-                                  sizeof(kJpegImage), sizeof(kJpegImage));
+                                  sizeof(kJpegImage));
   image->loader()->didFinishLoading(0.0, sizeof(kJpegImage),
                                     sizeof(kJpegImage));
 
@@ -1107,7 +1102,6 @@ TEST(ImageResourceTest,
                                          sizeof(kJpegImage)));
   image->loader()->didReceiveResponse(WrappedResourceResponse(response));
   image->loader()->didReceiveData(reinterpret_cast<const char*>(kJpegImage),
-                                  kJpegImageSubrangeWithDimensionsLength,
                                   kJpegImageSubrangeWithDimensionsLength);
   image->loader()->didFinishLoading(0.0, kJpegImageSubrangeWithDimensionsLength,
                                     kJpegImageSubrangeWithDimensionsLength);