Phase II Step 3: Reload LoFi/placeholder images via new ImageResource

third_party/WebKit/Source/core/loader/resource/MockImageResourceClient.cpp

Index: third_party/WebKit/Source/core/loader/resource/MockImageResourceClient.cpp
diff --git a/third_party/WebKit/Source/core/loader/resource/MockImageResourceClient.cpp b/third_party/WebKit/Source/core/loader/resource/MockImageResourceClient.cpp
index 56e0c2eeb5c81f6881fcd609193540db2843b697..a0d044a7d236fe7637e045728afcbecbf5fc1628 100644
--- a/third_party/WebKit/Source/core/loader/resource/MockImageResourceClient.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/MockImageResourceClient.cpp
@@ -15,33 +15,35 @@ MockImageResourceClient::MockImageResourceClient(ImageResource* resource)
       m_imageChangedCount(0),
       m_encodedSizeOnLastImageChanged(0),
       m_imageNotifyFinishedCount(0),
-      m_encodedSizeOnImageNotifyFinished(0) {
-  toImageResource(m_resource)->getContent()->addObserver(this);
+      m_encodedSizeOnImageNotifyFinished(0),
+      m_content(resource->getContent()) {
+  m_content->addObserver(this);
 }
 
 MockImageResourceClient::~MockImageResourceClient() {}
 
-void MockImageResourceClient::removeAsClient() {
-  toImageResource(m_resource)->getContent()->removeObserver(this);
+void MockImageResourceClient::removeAsClientAndObserver() {
+  m_content->removeObserver(this);
   MockResourceClient::removeAsClient();
 }
 
 void MockImageResourceClient::dispose() {
-  if (m_resource)
-    toImageResource(m_resource)->getContent()->removeObserver(this);
+  if (m_content)
+    m_content->removeObserver(this);
   MockResourceClient::dispose();
 }
 
 void MockImageResourceClient::imageChanged(ImageResourceContent* image,
                                            const IntRect*) {
   m_imageChangedCount++;
-  m_encodedSizeOnLastImageChanged = m_resource->encodedSize();
+  m_encodedSizeOnLastImageChanged = m_content->resourceForTest()->encodedSize();
 }
 
 void MockImageResourceClient::imageNotifyFinished(ImageResourceContent* image) {
   ASSERT_EQ(0, m_imageNotifyFinishedCount);
   m_imageNotifyFinishedCount++;
-  m_encodedSizeOnImageNotifyFinished = m_resource->encodedSize();
+  m_encodedSizeOnImageNotifyFinished =
+      m_content->resourceForTest()->encodedSize();
 }
 
 bool MockImageResourceClient::notifyFinishedCalled() const {