Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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 0b6aa4aeb17d4806ac730ee67e2c86e1a58ed1bf..b08bba694f12b2276978bf05ad02cf8f9b317b10 100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
+++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
@@ -36,7 +36,6 @@
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/MockImageResourceClient.h"
-#include "core/fetch/ResourcePtr.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
@@ -82,7 +81,8 @@ protected:
 TEST_F(ImageBitmapTest, ImageResourceConsistency)
 {
     RefPtrWillBeRawPtr<HTMLImageElement> imageElement = HTMLImageElement::create(*Document::create().get());
-    imageElement->setImageResource(new ImageResource(StaticBitmapImage::create(m_image).get()));
+    RefPtrWillBeRawPtr<ImageResource> image = ImageResource::create(StaticBitmapImage::create(m_image).get());
+    imageElement->setImageResource(image.get());
 
     RefPtrWillBeRawPtr<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageElement.get(),
         IntRect(0, 0, m_image->width(), m_image->height()),
@@ -110,22 +110,22 @@ TEST_F(ImageBitmapTest, ImageResourceConsistency)
 TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority)
 {
     RefPtrWillBePersistent<HTMLImageElement> imageNoCrop = HTMLImageElement::create(*Document::create().get());
-    ResourcePtr<ImageResource> cachedImageNoCrop = new ImageResource(ResourceRequest("http://foo.com/1"),
+    RefPtrWillBeRawPtr<ImageResource> cachedImageNoCrop = ImageResource::create(ResourceRequest("http://foo.com/1"),
         StaticBitmapImage::create(m_image).get());
     imageNoCrop->setImageResource(cachedImageNoCrop.get());
 
     RefPtrWillBePersistent<HTMLImageElement> imageInteriorCrop = HTMLImageElement::create(*Document::create().get());
-    ResourcePtr<ImageResource> cachedImageInteriorCrop = new ImageResource(ResourceRequest("http://foo.com/2"),
+    RefPtrWillBeRawPtr<ImageResource> cachedImageInteriorCrop = ImageResource::create(ResourceRequest("http://foo.com/2"),
         StaticBitmapImage::create(m_image).get());
     imageInteriorCrop->setImageResource(cachedImageInteriorCrop.get());
 
     RefPtrWillBePersistent<HTMLImageElement> imageExteriorCrop = HTMLImageElement::create(*Document::create().get());
-    ResourcePtr<ImageResource> cachedImageExteriorCrop = new ImageResource(ResourceRequest("http://foo.com/3"),
+    RefPtrWillBeRawPtr<ImageResource> cachedImageExteriorCrop = ImageResource::create(ResourceRequest("http://foo.com/3"),
         StaticBitmapImage::create(m_image).get());
     imageExteriorCrop->setImageResource(cachedImageExteriorCrop.get());
 
     RefPtrWillBePersistent<HTMLImageElement> imageOutsideCrop = HTMLImageElement::create(*Document::create().get());
-    ResourcePtr<ImageResource> cachedImageOutsideCrop = new ImageResource(ResourceRequest("http://foo.com/4"),
+    RefPtrWillBeRawPtr<ImageResource> cachedImageOutsideCrop = ImageResource::create(ResourceRequest("http://foo.com/4"),
         StaticBitmapImage::create(m_image).get());
     imageOutsideCrop->setImageResource(cachedImageOutsideCrop.get());
 
@@ -191,7 +191,7 @@ TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority)
 TEST_F(ImageBitmapTest, ImageBitmapSourceChanged)
 {
     RefPtrWillBeRawPtr<HTMLImageElement> image = HTMLImageElement::create(*Document::create().get());
-    ResourcePtr<ImageResource> originalImageResource = new ImageResource(
+    RefPtrWillBeRawPtr<ImageResource> originalImageResource = ImageResource::create(
         StaticBitmapImage::create(m_image).get());
     image->setImageResource(originalImageResource.get());
 
@@ -200,7 +200,7 @@ TEST_F(ImageBitmapTest, ImageBitmapSourceChanged)
         &(image->document()));
     ASSERT_EQ(imageBitmap->bitmapImage()->imageForCurrentFrame(), originalImageResource->image()->imageForCurrentFrame());
 
-    ResourcePtr<ImageResource> newImageResource = new ImageResource(
+    RefPtrWillBeRawPtr<ImageResource> newImageResource = ImageResource::create(
         StaticBitmapImage::create(m_image2).get());
     image->setImageResource(newImageResource.get());