[WIP] ImageResourceClient->ImageResourceObserver

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

Index: third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
index 4facb09bb65041718f6f60689f2ace02544e88c2..cfa1f2361eff82ce10db3bb4383dcdb12b0040f8 100644
--- a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
@@ -30,7 +30,7 @@
 
 #include "core/fetch/MemoryCache.h"
 
-#include "core/fetch/MockImageResourceClient.h"
+#include "core/fetch/MockResourceClients.h"
 #include "core/fetch/RawResource.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/testing/UnitTestHelpers.h"
@@ -133,7 +133,7 @@ TEST_F(MemoryCacheTest, VeryLargeResourceAccounting)
     ASSERT_EQ(cachedResource->size(), memoryCache()->deadSize());
     ASSERT_EQ(0u, memoryCache()->liveSize());
 
-    MockImageResourceClient client(cachedResource);
+    MockResourceClient client(cachedResource);
     ASSERT_EQ(0u, memoryCache()->deadSize());
     ASSERT_EQ(cachedResource->size(), memoryCache()->liveSize());
 
@@ -206,7 +206,7 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, Re
     memoryCache()->setCapacities(minDeadCapacity, maxDeadCapacity, totalCapacity);
     const char data[6] = "abcde";
     cachedDeadResource->appendData(data, 3u);
-    MockImageResourceClient client(cachedLiveResource);
+    MockResourceClient client(cachedLiveResource);
     cachedLiveResource->appendData(data, 4u);
 
     class Task1 : public WebTaskRunner::Task {
@@ -314,9 +314,9 @@ TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_MultipleResourceMaps)
 static void TestClientRemoval(Resource* resource1, Resource* resource2)
 {
     const char data[6] = "abcde";
-    MockImageResourceClient client1(resource1);
+    MockResourceClient client1(resource1);
     resource1->appendData(data, 4u);
-    MockImageResourceClient client2(resource2);
+    MockResourceClient client2(resource2);
     resource2->appendData(data, 4u);
 
     const unsigned minDeadCapacity = 0;
@@ -402,8 +402,8 @@ static void TestDecodeCacheOrder(Resource* cachedImageLowPriority, Resource* cac
     memoryCache()->setDelayBeforeLiveDecodedPrune(0);
     memoryCache()->setMaxPruneDeferralDelay(0);
 
-    MockImageResourceClient clientLowPriority(cachedImageLowPriority);
-    MockImageResourceClient clientHighPriority(cachedImageHighPriority);
+    MockResourceClient clientLowPriority(cachedImageLowPriority);
+    MockResourceClient clientHighPriority(cachedImageHighPriority);
 
     const char data[5] = "abcd";
     cachedImageLowPriority->appendData(data, 1u);