Remove duplication of encoded image data

third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

Index: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
index 239564a918038758d5deca2b400df1257277affe..c06d936d0310ae03a9b53cf433187d29f8d7e694 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
@@ -237,7 +237,7 @@ TEST(ImageResourceTest, MultipartImage)
 
     // This part finishes. The image is created, callbacks are sent, and the data buffer is cleared.
     cachedImage->loader()->didFinishLoading(nullptr, 0.0, 0);
-    ASSERT_FALSE(cachedImage->resourceBuffer());
+    ASSERT_TRUE(cachedImage->resourceBuffer());
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
@@ -302,12 +302,14 @@ TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients)
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
 
-    // The ImageResource no longer has clients. The image should be deleted by prune.
+    // The ImageResource no longer has clients. The decoded image data should be
+    // deleted by prune.
     client->removeAsClient();
     cachedImage->prune();
     ASSERT_FALSE(cachedImage->hasClientsOrObservers());
-    ASSERT_FALSE(cachedImage->hasImage());
-    ASSERT_TRUE(cachedImage->getImage()->isNull());
+    ASSERT_TRUE(cachedImage->hasImage());
+    // TODO(hajimehoshi): Should check cachedImage doesn't have decoded image
+    // data.
 }
 
 TEST(ImageResourceTest, UpdateBitmapImages)
@@ -357,9 +359,9 @@ TEST(ImageResourceTest, ReloadIfLoFi)
 
     cachedImage->reloadIfLoFi(fetcher);
     ASSERT_FALSE(cachedImage->errorOccurred());
-    ASSERT_FALSE(cachedImage->resourceBuffer());
+    ASSERT_TRUE(cachedImage->resourceBuffer());
     ASSERT_TRUE(cachedImage->hasImage());
-    ASSERT_EQ(client->imageChangedCount(), 3);
+    ASSERT_EQ(client->imageChangedCount(), 2);
 
     cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(resourceResponse), nullptr);
     cachedImage->loader()->didReceiveData(nullptr, reinterpret_cast<const char*>(jpeg.data()), jpeg.size(), jpeg.size());
@@ -599,7 +601,7 @@ TEST(ImageResourceTest, AddClientAfterPrune)
 
     imageResource->prune();
 
-    EXPECT_FALSE(imageResource->hasImage());
+    EXPECT_TRUE(imageResource->hasImage());
 
     // Re-adds a ResourceClient but not ImageResourceObserver.
     Persistent<MockResourceClient> client2 = new MockResourceClient(imageResource);