[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp

Index: third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
diff --git a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
index 964d9b8b31bf55716ef749f8c8db29d51c9310a5..1bc31afa4c7ea01b52f7625fe825eedc691bf1bb 100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
+++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
@@ -32,7 +32,7 @@
 
 #include "SkPixelRef.h"  // FIXME: qualify this skia header file.
 #include "core/dom/Document.h"
-#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ -81,8 +81,8 @@ TEST_F(ImageBitmapTest, ImageResourceConsistency) {
   const ImageBitmapOptions defaultOptions;
   HTMLImageElement* imageElement =
       HTMLImageElement::create(*Document::create());
-  ImageResource* image =
-      ImageResource::create(StaticBitmapImage::create(m_image).get());
+  ImageResourceContent* image =
+      ImageResourceContent::create(StaticBitmapImage::create(m_image).get());
   imageElement->setImageResource(image);
 
   Optional<IntRect> cropRect =
@@ -118,8 +118,8 @@ TEST_F(ImageBitmapTest, ImageResourceConsistency) {
 // reference to the original Image if the HTMLImageElement src is changed.
 TEST_F(ImageBitmapTest, ImageBitmapSourceChanged) {
   HTMLImageElement* image = HTMLImageElement::create(*Document::create());
-  ImageResource* originalImageResource =
-      ImageResource::create(StaticBitmapImage::create(m_image).get());
+  ImageResourceContent* originalImageResource =
+      ImageResourceContent::create(StaticBitmapImage::create(m_image).get());
   image->setImageResource(originalImageResource);
 
   const ImageBitmapOptions defaultOptions;
@@ -130,8 +130,8 @@ TEST_F(ImageBitmapTest, ImageBitmapSourceChanged) {
   ASSERT_EQ(imageBitmap->bitmapImage()->imageForCurrentFrame(),
             originalImageResource->getImage()->imageForCurrentFrame());
 
-  ImageResource* newImageResource =
-      ImageResource::create(StaticBitmapImage::create(m_image2).get());
+  ImageResourceContent* newImageResource =
+      ImageResourceContent::create(StaticBitmapImage::create(m_image2).get());
   image->setImageResource(newImageResource);
 
   // The ImageBitmap should contain the same data as the original cached image