[ImageResource 4] Split ImageResource into Resource and Image parts

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 223 matching lines @@
 
   // 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(
       WrappedResourceResponse(multipartResponse), nullptr);
   EXPECT_FALSE(cachedImage->resourceBuffer());
-  EXPECT_FALSE(cachedImage->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->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));
   // Send the response for the first real part. No image or data buffer is
   // created.
   EXPECT_FALSE(cachedImage->resourceBuffer());
-  EXPECT_FALSE(cachedImage->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->hasImage());
   EXPECT_EQ(0, client->imageChangedCount());
   EXPECT_FALSE(client->notifyFinishedCalled());
   EXPECT_EQ("image/svg+xml", cachedImage->response().mimeType());
 
   const char secondPart[] =
       "<svg xmlns='http://www.w3.org/2000/svg' width='1' height='1'><rect "
       "width='1' height='1' fill='green'/></svg>\n";
   // The first bytes arrive. The data buffer is created, but no image is
   // created.
   cachedImage->appendData(secondPart, strlen(secondPart));
   EXPECT_TRUE(cachedImage->resourceBuffer());
-  EXPECT_FALSE(cachedImage->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->hasImage());
   EXPECT_EQ(0, client->imageChangedCount());
   EXPECT_FALSE(client->notifyFinishedCalled());
 
   // Add a client to check an assertion error doesn't happen
   // (crbug.com/630983).
   Persistent<MockImageResourceClient> client2 =
       new MockImageResourceClient(cachedImage);
   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(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());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->getImage()->isNull());
+  EXPECT_EQ(1, cachedImage->getContent()->getImage()->width());
+  EXPECT_EQ(1, cachedImage->getContent()->getImage()->height());
   EXPECT_EQ(1, client->imageChangedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(1, client2->imageChangedCount());
   EXPECT_TRUE(client2->notifyFinishedCalled());
 }
 
 TEST(ImageResourceTest, CancelOnDetach) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
@@ skipping 40 matching lines @@
   cachedImage->responseReceived(
       ResourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage), nullAtom,
                        String()),
       nullptr);
   cachedImage->appendData(reinterpret_cast<const char*>(kJpegImage),
                           sizeof(kJpegImage));
   EXPECT_NE(0u, cachedImage->encodedSizeMemoryUsageForTesting());
   cachedImage->finish();
   EXPECT_EQ(0u, cachedImage->encodedSizeMemoryUsageForTesting());
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->getImage()->isNull());
   EXPECT_TRUE(client->notifyFinishedCalled());
 
   // The prune comes when the ImageResource still has clients. The image should
   // not be deleted.
   cachedImage->prune();
   EXPECT_TRUE(cachedImage->isAlive());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->getImage()->isNull());
 
   // The ImageResource no longer has clients. The decoded image data should be
   // deleted by prune.
   client->removeAsClient();
   cachedImage->prune();
   EXPECT_FALSE(cachedImage->isAlive());
-  EXPECT_TRUE(cachedImage->hasImage());
+  EXPECT_TRUE(cachedImage->getContent()->hasImage());
   // TODO(hajimehoshi): Should check cachedImage doesn't have decoded image
   // data.
 }
 
 TEST(ImageResourceTest, UpdateBitmapImages) {
   ImageResource* cachedImage = ImageResource::create(ResourceRequest());
   cachedImage->setStatus(Resource::Pending);
 
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(cachedImage);
 
   // Send the image response.
   cachedImage->responseReceived(
       ResourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage), nullAtom,
                        String()),
       nullptr);
   cachedImage->appendData(reinterpret_cast<const char*>(kJpegImage),
                           sizeof(kJpegImage));
   cachedImage->finish();
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
+  EXPECT_TRUE(cachedImage->getContent()->getImage()->isBitmapImage());
 }
 
 TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
   ResourceRequest request = ResourceRequest(testURL);
   request.setLoFiState(WebURLRequest::LoFiOn);
   ImageResource* cachedImage = ImageResource::create(request);
   cachedImage->setStatus(Resource::Pending);
 
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(cachedImage);
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
 
   // Send the image response.
   ResourceResponse resourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage),
                                     nullAtom, String());
   resourceResponse.addHTTPHeaderField("chrome-proxy-content-transform",
                                       "empty-image");
 
   cachedImage->responseReceived(resourceResponse, nullptr);
   cachedImage->appendData(reinterpret_cast<const char*>(kJpegImage),
                           sizeof(kJpegImage));
   cachedImage->finish();
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnLastImageChanged());
   // The client should have been notified that the image load completed.
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnImageNotifyFinished());
-  EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
-  EXPECT_EQ(1, cachedImage->getImage()->width());
-  EXPECT_EQ(1, cachedImage->getImage()->height());
+  EXPECT_TRUE(cachedImage->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(1, cachedImage->getContent()->getImage()->width());
+  EXPECT_EQ(1, cachedImage->getContent()->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());
+  EXPECT_FALSE(cachedImage->getContent()->hasImage());
+  EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
 
   cachedImage->loader()->didReceiveResponse(
       WrappedResourceResponse(resourceResponse), nullptr);
   cachedImage->loader()->didReceiveData(
       reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
       sizeof(kJpegImage2));
   cachedImage->loader()->didFinishLoading(0.0, sizeof(kJpegImage2),
                                           sizeof(kJpegImage2));
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->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());
-  EXPECT_EQ(50, cachedImage->getImage()->width());
-  EXPECT_EQ(50, cachedImage->getImage()->height());
+  EXPECT_TRUE(cachedImage->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(50, cachedImage->getContent()->getImage()->width());
+  EXPECT_EQ(50, cachedImage->getContent()->getImage()->height());
 }
 
 TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderDuringFetch) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
   ResourceRequest request(testURL);
   request.setLoFiState(WebURLRequest::LoFiOn);
   FetchRequest fetchRequest(request, FetchInitiatorInfo());
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
 
   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(
       WrappedResourceResponse(initialResourceResponse));
   cachedImage->loader()->didReceiveData(
       reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage),
       sizeof(kJpegImage));
 
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->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());
+  EXPECT_TRUE(cachedImage->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(1, cachedImage->getContent()->getImage()->width());
+  EXPECT_EQ(1, cachedImage->getContent()->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_FALSE(cachedImage->getContent()->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(
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kJpegImage2), nullAtom, String())),
       nullptr);
   cachedImage->loader()->didReceiveData(
       reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
       sizeof(kJpegImage2));
   cachedImage->loader()->didFinishLoading(0.0, sizeof(kJpegImage2),
                                           sizeof(kJpegImage2));
 
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->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());
   EXPECT_EQ(sizeof(kJpegImage2), client->encodedSizeOnImageNotifyFinished());
-  EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
-  EXPECT_EQ(50, cachedImage->getImage()->width());
-  EXPECT_EQ(50, cachedImage->getImage()->height());
+  EXPECT_TRUE(cachedImage->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(50, cachedImage->getContent()->getImage()->width());
+  EXPECT_EQ(50, cachedImage->getContent()->getImage()->height());
 }
 
 TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderForPlaceholder) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
   FetchRequest request(testURL, FetchInitiatorInfo());
   request.setAllowImagePlaceholder();
@@ skipping 35 matching lines @@
 TEST(ImageResourceTest, SVGImage) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isBitmapImage());
 }
 
 TEST(ImageResourceTest, SuccessfulRevalidationJpeg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(1, imageResource->getImage()->width());
-  EXPECT_EQ(1, imageResource->getImage()->height());
+  EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(304);
 
   imageResource->responseReceived(response, nullptr);
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(1, imageResource->getImage()->width());
-  EXPECT_EQ(1, imageResource->getImage()->height());
+  EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->height());
 }
 
 TEST(ImageResourceTest, SuccessfulRevalidationSvg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(200, imageResource->getImage()->width());
-  EXPECT_EQ(200, imageResource->getImage()->height());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(304);
   imageResource->responseReceived(response, nullptr);
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(200, imageResource->getImage()->width());
-  EXPECT_EQ(200, imageResource->getImage()->height());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->height());
 }
 
 TEST(ImageResourceTest, FailedRevalidationJpegToJpeg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(1, imageResource->getImage()->width());
-  EXPECT_EQ(1, imageResource->getImage()->height());
+  EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage2),
                   sizeof(kJpegImage2));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(4, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(50, imageResource->getImage()->width());
-  EXPECT_EQ(50, imageResource->getImage()->height());
+  EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(50, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(50, imageResource->getContent()->getImage()->height());
 }
 
 TEST(ImageResourceTest, FailedRevalidationJpegToSvg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(1, imageResource->getImage()->width());
-  EXPECT_EQ(1, imageResource->getImage()->height());
+  EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(3, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(200, imageResource->getImage()->width());
-  EXPECT_EQ(200, imageResource->getImage()->height());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->height());
 }
 
 TEST(ImageResourceTest, FailedRevalidationSvgToJpeg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(200, imageResource->getImage()->width());
-  EXPECT_EQ(200, imageResource->getImage()->height());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(3, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(1, imageResource->getImage()->width());
-  EXPECT_EQ(1, imageResource->getImage()->height());
+  EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->height());
 }
 
 TEST(ImageResourceTest, FailedRevalidationSvgToSvg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(200, imageResource->getImage()->width());
-  EXPECT_EQ(200, imageResource->getImage()->height());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(200, imageResource->getContent()->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage2,
                   strlen(kSvgImage2));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
   EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
-  EXPECT_EQ(300, imageResource->getImage()->width());
-  EXPECT_EQ(300, imageResource->getImage()->height());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(300, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(300, imageResource->getContent()->getImage()->height());
 }
 
 // Tests for pruning.
 
 TEST(ImageResourceTest, AddClientAfterPrune) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
 
   // Adds a ResourceClient but not ImageResourceObserver.
   Persistent<MockResourceClient> client1 =
       new MockResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
-  EXPECT_EQ(1, imageResource->getImage()->width());
-  EXPECT_EQ(1, imageResource->getImage()->height());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->height());
   EXPECT_TRUE(client1->notifyFinishedCalled());
 
   client1->removeAsClient();
 
   EXPECT_FALSE(imageResource->isAlive());
 
   imageResource->prune();
 
-  EXPECT_TRUE(imageResource->hasImage());
+  EXPECT_TRUE(imageResource->getContent()->hasImage());
 
   // Re-adds a ResourceClient but not ImageResourceObserver.
   Persistent<MockResourceClient> client2 =
       new MockResourceClient(imageResource);
 
-  ASSERT_TRUE(imageResource->hasImage());
-  EXPECT_FALSE(imageResource->getImage()->isNull());
-  EXPECT_EQ(1, imageResource->getImage()->width());
-  EXPECT_EQ(1, imageResource->getImage()->height());
+  ASSERT_TRUE(imageResource->getContent()->hasImage());
+  EXPECT_FALSE(imageResource->getContent()->getImage()->isNull());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->width());
+  EXPECT_EQ(1, imageResource->getContent()->getImage()->height());
   EXPECT_TRUE(client2->notifyFinishedCalled());
 }
 
 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());
@@ skipping 33 matching lines @@
 
   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());
 
-  ASSERT_TRUE(image->hasImage());
-  EXPECT_EQ(1, image->getImage()->width());
-  EXPECT_EQ(1, image->getImage()->height());
-  EXPECT_TRUE(image->getImage()->isBitmapImage());
+  ASSERT_TRUE(image->getContent()->hasImage());
+  EXPECT_EQ(1, image->getContent()->getImage()->width());
+  EXPECT_EQ(1, image->getContent()->getImage()->height());
+  EXPECT_TRUE(image->getContent()->getImage()->isBitmapImage());
 }
 
 TEST(ImageResourceTest, FetchAllowPlaceholderDataURL) {
   KURL testURL(ParsedURLString,
                "data:image/jpeg;base64," +
                    base64Encode(reinterpret_cast<const char*>(kJpegImage),
                                 sizeof(kJpegImage)));
   FetchRequest request(testURL, FetchInitiatorInfo());
   request.setAllowImagePlaceholder();
   ImageResource* image = ImageResource::fetch(
@@ skipping 76 matching lines @@
   EXPECT_TRUE(image->isPlaceholder());
   EXPECT_LT(0, client->imageChangedCount());
   EXPECT_EQ(kJpegImageSubrangeWithDimensionsLength,
             client->encodedSizeOnLastImageChanged());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(kJpegImageSubrangeWithDimensionsLength,
             client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(kJpegImageSubrangeWithDimensionsLength,
             client->encodedSizeOnImageNotifyFinished());
 
-  ASSERT_TRUE(image->hasImage());
-  EXPECT_EQ(1, image->getImage()->width());
-  EXPECT_EQ(1, image->getImage()->height());
-  EXPECT_FALSE(image->getImage()->isBitmapImage());
-  EXPECT_FALSE(image->getImage()->isSVGImage());
+  ASSERT_TRUE(image->getContent()->hasImage());
+  EXPECT_EQ(1, image->getContent()->getImage()->width());
+  EXPECT_EQ(1, image->getContent()->getImage()->height());
+  EXPECT_FALSE(image->getContent()->getImage()->isBitmapImage());
+  EXPECT_FALSE(image->getContent()->getImage()->isSVGImage());
 }
 
 TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
   FetchRequest request(testURL, FetchInitiatorInfo());
   request.setAllowImagePlaceholder();
   ImageResource* image = ImageResource::fetch(
       request,
@@ skipping 33 matching lines @@
   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(1, client->imageNotifyFinishedCount());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnImageNotifyFinished());
 
-  ASSERT_TRUE(image->hasImage());
-  EXPECT_EQ(1, image->getImage()->width());
-  EXPECT_EQ(1, image->getImage()->height());
-  EXPECT_TRUE(image->getImage()->isBitmapImage());
+  ASSERT_TRUE(image->getContent()->hasImage());
+  EXPECT_EQ(1, image->getContent()->getImage()->width());
+  EXPECT_EQ(1, image->getContent()->getImage()->height());
+  EXPECT_TRUE(image->getContent()->getImage()->isBitmapImage());
 }
 
 TEST(ImageResourceTest, FetchAllowPlaceholderThenDisallowPlaceholder) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
   FetchRequest placeholderRequest(testURL, FetchInitiatorInfo());
   placeholderRequest.setAllowImagePlaceholder();
@@ skipping 82 matching lines @@
 
   // This is number is sufficiently large amount of bytes necessary for the
   // image to be created (since the size is known). This was determined by
   // appending one byte at a time (with flushes) until the image was decoded.
   size_t meaningfulImageSize = 280;
   cachedImage->appendData(reinterpret_cast<const char*>(kJpegImage2),
                           meaningfulImageSize);
   size_t bytesSent = meaningfulImageSize;
 
   EXPECT_FALSE(cachedImage->errorOccurred());
-  EXPECT_TRUE(cachedImage->hasImage());
+  EXPECT_TRUE(cachedImage->getContent()->hasImage());
   EXPECT_EQ(1, client->imageChangedCount());
 
   platform.runForPeriodSeconds(1.);
   platform.advanceClockSeconds(1.);
 
   // Sanity check that we created an image after appending |meaningfulImageSize|
   // bytes just once.
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
   EXPECT_EQ(1, client->imageChangedCount());
 
   for (int flushCount = 1; flushCount <= 3; ++flushCount) {
     // For each of the iteration that appends data, we don't expect
     // |imageChangeCount()| to change, since the time is adjusted by 0.2001
     // seconds (it's greater than 0.2 to avoid double precision problems).
     // After 5 appends, we breach the flush interval and the flush count
     // increases.
     for (int i = 0; i < 5; ++i) {
       SCOPED_TRACE(i);
       cachedImage->appendData(
           reinterpret_cast<const char*>(kJpegImage2) + bytesSent, 1);
 
       EXPECT_FALSE(cachedImage->errorOccurred());
-      ASSERT_TRUE(cachedImage->hasImage());
+      ASSERT_TRUE(cachedImage->getContent()->hasImage());
       EXPECT_EQ(flushCount, client->imageChangedCount());
 
       ++bytesSent;
       platform.runForPeriodSeconds(0.2001);
     }
   }
 
   // Increasing time by a large number only causes one extra flush.
   platform.runForPeriodSeconds(10.);
   platform.advanceClockSeconds(10.);
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->getImage()->isNull());
   EXPECT_EQ(4, client->imageChangedCount());
 
   // Append the rest of the data and finish (which causes another flush).
   cachedImage->appendData(
       reinterpret_cast<const char*>(kJpegImage2) + bytesSent,
       sizeof(kJpegImage2) - bytesSent);
   cachedImage->finish();
 
   EXPECT_FALSE(cachedImage->errorOccurred());
-  ASSERT_TRUE(cachedImage->hasImage());
-  EXPECT_FALSE(cachedImage->getImage()->isNull());
+  ASSERT_TRUE(cachedImage->getContent()->hasImage());
+  EXPECT_FALSE(cachedImage->getContent()->getImage()->isNull());
   EXPECT_EQ(5, client->imageChangedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
-  EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
-  EXPECT_EQ(50, cachedImage->getImage()->width());
-  EXPECT_EQ(50, cachedImage->getImage()->height());
+  EXPECT_TRUE(cachedImage->getContent()->getImage()->isBitmapImage());
+  EXPECT_EQ(50, cachedImage->getContent()->getImage()->width());
+  EXPECT_EQ(50, cachedImage->getContent()->getImage()->height());
 
   WTF::setTimeFunctionsForTesting(nullptr);
 }
 
 }  // namespace
 }  // namespace blink