Phase II Step 1: Remove updateImage() reentrancy around decodeError()

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

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 9f2b13c29a53d7bc31785370eafc48ee8d373820..8e86729bec6e07b92669ffb60c0a1056b0cbf794 100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
@@ -922,7 +922,7 @@ TEST(ImageResourceTest, CancelOnDecodeError) {
   EXPECT_TRUE(observer->imageNotifyFinishedCalled());
   EXPECT_EQ(ResourceStatus::DecodeError,
             observer->statusOnImageNotifyFinished());
-  EXPECT_EQ(2, observer->imageChangedCount());
+  EXPECT_EQ(1, observer->imageChangedCount());

[hiroshige, 2017/01/25 02:49:15]

As mentioned in the design doc and CL description, the number of imageChanged()
is decreased by one, which probably looks safe.

   EXPECT_FALSE(imageResource->isLoading());
 }
 
@@ -1132,7 +1132,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
   // The dimensions could not be extracted, so the full original image should be
   // loading.
   EXPECT_FALSE(observer->imageNotifyFinishedCalled());
-  EXPECT_EQ(3, observer->imageChangedCount());
+  EXPECT_EQ(2, observer->imageChangedCount());

[hiroshige, 2017/01/25 02:49:15]

ditto.

 
   testThatReloadIsStartedAndDoReload(testURL, imageResource,
                                      imageResource->getContent(),