| Index: third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
|
| index 276b3bce06467e27985b88803db4b89c949a6b24..125e0a9df28051b37004c429851085e210a2a315 100644
|
| --- a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
|
| @@ -245,7 +245,7 @@ TEST(ImageResourceTest, MultipartImage) {
|
| // 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());
|
| + nullAtom);
|
| multipartResponse.setMultipartBoundary("boundary", strlen("boundary"));
|
| imageResource->loader()->didReceiveResponse(
|
| WrappedResourceResponse(multipartResponse), nullptr);
|
| @@ -346,13 +346,11 @@ TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients) {
|
|
|
| // Send the image response.
|
| imageResource->responseReceived(
|
| - ResourceResponse(KURL(), "multipart/x-mixed-replace", 0, nullAtom,
|
| - String()),
|
| + ResourceResponse(KURL(), "multipart/x-mixed-replace", 0, nullAtom),
|
| nullptr);
|
|
|
| imageResource->responseReceived(
|
| - ResourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage), nullAtom,
|
| - String()),
|
| + ResourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage), nullAtom),
|
| nullptr);
|
| imageResource->appendData(reinterpret_cast<const char*>(kJpegImage),
|
| sizeof(kJpegImage));
|
| @@ -390,8 +388,7 @@ TEST(ImageResourceTest, UpdateBitmapImages) {
|
|
|
| // Send the image response.
|
| imageResource->responseReceived(
|
| - ResourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage), nullAtom,
|
| - String()),
|
| + ResourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage), nullAtom),
|
| nullptr);
|
| imageResource->appendData(reinterpret_cast<const char*>(kJpegImage),
|
| sizeof(kJpegImage));
|
| @@ -419,7 +416,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
|
|
|
| // Send the image response.
|
| ResourceResponse resourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage),
|
| - nullAtom, String());
|
| + nullAtom);
|
| resourceResponse.addHTTPHeaderField("chrome-proxy-content-transform",
|
| "empty-image");
|
|
|
| @@ -483,8 +480,8 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderDuringFetch) {
|
| MockImageResourceObserver::create(imageResource->getContent());
|
|
|
| // Send the image response.
|
| - ResourceResponse initialResourceResponse(
|
| - testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String());
|
| + ResourceResponse initialResourceResponse(testURL, "image/jpeg",
|
| + sizeof(kJpegImage), nullAtom);
|
| initialResourceResponse.addHTTPHeaderField("chrome-proxy", "q=low");
|
|
|
| imageResource->loader()->didReceiveResponse(
|
| @@ -516,8 +513,8 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderDuringFetch) {
|
| EXPECT_FALSE(observer->imageNotifyFinishedCalled());
|
|
|
| imageResource->loader()->didReceiveResponse(
|
| - WrappedResourceResponse(ResourceResponse(
|
| - testURL, "image/jpeg", sizeof(kJpegImage2), nullAtom, String())),
|
| + WrappedResourceResponse(ResourceResponse(testURL, "image/jpeg",
|
| + sizeof(kJpegImage2), nullAtom)),
|
| nullptr);
|
| imageResource->loader()->didReceiveData(
|
| reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2));
|
| @@ -554,8 +551,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderForPlaceholder) {
|
| MockImageResourceObserver::create(imageResource->getContent());
|
|
|
| ResourceResponse response(testURL, "image/jpeg",
|
| - kJpegImageSubrangeWithDimensionsLength, nullAtom,
|
| - String());
|
| + kJpegImageSubrangeWithDimensionsLength, nullAtom);
|
| response.setHTTPStatusCode(206);
|
| response.setHTTPHeaderField(
|
| "content-range", buildContentRange(kJpegImageSubrangeWithDimensionsLength,
|
| @@ -858,7 +854,7 @@ TEST(ImageResourceTest, CancelOnDecodeError) {
|
|
|
| imageResource->loader()->didReceiveResponse(
|
| WrappedResourceResponse(
|
| - ResourceResponse(testURL, "image/jpeg", 18, nullAtom, String())),
|
| + ResourceResponse(testURL, "image/jpeg", 18, nullAtom)),
|
| nullptr);
|
|
|
| EXPECT_EQ(0, observer->imageChangedCount());
|
| @@ -886,7 +882,7 @@ TEST(ImageResourceTest, DecodeErrorWithEmptyBody) {
|
|
|
| imageResource->loader()->didReceiveResponse(
|
| WrappedResourceResponse(
|
| - ResourceResponse(testURL, "image/jpeg", 0, nullAtom, String())),
|
| + ResourceResponse(testURL, "image/jpeg", 0, nullAtom)),
|
| nullptr);
|
|
|
| EXPECT_EQ(ResourceStatus::Pending, imageResource->getStatus());
|
| @@ -919,9 +915,8 @@ TEST(ImageResourceTest, FetchDisallowPlaceholder) {
|
| std::unique_ptr<MockImageResourceObserver> observer =
|
| MockImageResourceObserver::create(imageResource->getContent());
|
|
|
| - imageResource->loader()->didReceiveResponse(
|
| - WrappedResourceResponse(ResourceResponse(
|
| - testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String())));
|
| + imageResource->loader()->didReceiveResponse(WrappedResourceResponse(
|
| + ResourceResponse(testURL, "image/jpeg", sizeof(kJpegImage), nullAtom)));
|
| imageResource->loader()->didReceiveData(
|
| reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage));
|
| imageResource->loader()->didFinishLoading(0.0, sizeof(kJpegImage),
|
| @@ -1014,8 +1009,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderSuccessful) {
|
| MockImageResourceObserver::create(imageResource->getContent());
|
|
|
| ResourceResponse response(testURL, "image/jpeg",
|
| - kJpegImageSubrangeWithDimensionsLength, nullAtom,
|
| - String());
|
| + kJpegImageSubrangeWithDimensionsLength, nullAtom);
|
| response.setHTTPStatusCode(206);
|
| response.setHTTPHeaderField(
|
| "content-range", buildContentRange(kJpegImageSubrangeWithDimensionsLength,
|
| @@ -1064,9 +1058,8 @@ TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
|
|
|
| const char kBadData[] = "notanimageresponse";
|
|
|
| - imageResource->loader()->didReceiveResponse(
|
| - WrappedResourceResponse(ResourceResponse(
|
| - testURL, "image/jpeg", sizeof(kBadData), nullAtom, String())));
|
| + imageResource->loader()->didReceiveResponse(WrappedResourceResponse(
|
| + ResourceResponse(testURL, "image/jpeg", sizeof(kBadData), nullAtom)));
|
|
|
| EXPECT_EQ(0, observer->imageChangedCount());
|
|
|
| @@ -1084,9 +1077,8 @@ TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
|
| EXPECT_FALSE(observer->imageNotifyFinishedCalled());
|
| EXPECT_EQ(3, observer->imageChangedCount());
|
|
|
| - imageResource->loader()->didReceiveResponse(
|
| - WrappedResourceResponse(ResourceResponse(
|
| - testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String())));
|
| + imageResource->loader()->didReceiveResponse(WrappedResourceResponse(
|
| + ResourceResponse(testURL, "image/jpeg", sizeof(kJpegImage), nullAtom)));
|
| imageResource->loader()->didReceiveData(
|
| reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage));
|
| imageResource->loader()->didFinishLoading(0.0, sizeof(kJpegImage),
|
| @@ -1150,8 +1142,7 @@ TEST(ImageResourceTest,
|
| MockImageResourceObserver::create(imageResource->getContent());
|
|
|
| ResourceResponse response(testURL, "image/jpeg",
|
| - kJpegImageSubrangeWithDimensionsLength, nullAtom,
|
| - String());
|
| + kJpegImageSubrangeWithDimensionsLength, nullAtom);
|
| response.setHTTPStatusCode(206);
|
| response.setHTTPHeaderField(
|
| "content-range", buildContentRange(kJpegImageSubrangeWithDimensionsLength,
|
| @@ -1202,7 +1193,7 @@ TEST(ImageResourceTest, PeriodicFlushTest) {
|
|
|
| // Send the image response.
|
| ResourceResponse resourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage2),
|
| - nullAtom, String());
|
| + nullAtom);
|
| resourceResponse.addHTTPHeaderField("chrome-proxy", "q=low");
|
|
|
| imageResource->responseReceived(resourceResponse, nullptr);
|
|
|