Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

We are planning to move ResourceClient to on-heap, but LayoutObject (an
ImageResourceClient subclass) is hard to move to on-heap.

This series of CLs splits ImageResourceClient into
- ResourceClient (notified via Resource, to be moved to Oilpan heap) and
- ImageResourceObserver (notified via ImageObserver, to remain non-heap)
and makes LayoutObject to be ImageResourceObserver but not ResourceClient.

This is the [1/2] CL that
- Splits ImageResourceClient into ResourceClient and ImageResourceObserver,
- Makes LayoutObject and all of its subclasses (except for LayoutImage and its
  subclasses) to be ImageResourceObserver but not ResourceClient.

LayoutImage will be made non-ResourceClient by the [2/2] CL:
https://codereview.chromium.org/1728313003/.

Original CL: https://codereview.chromium.org/1697713002/ by Nate Chapin.

In addition to Nate's original CL (Patch Set 1), this CL:
- Fixes layout test (Patch Set 2).
- Reuses ResourceClientWalker to iterate ImageResourceObserver (Patch Set 3).
- Handles ResourceClient and ImageResourceObserver more similarly (Patch Set 4).
- Renames methods to reflect whether they are for both ResourceClient and
  ImageResourceObserver (Patch Set 6).

BUG=587663

Review URL: https://codereview.chromium.org/1706083002

Cr-Commit-Position: refs/heads/master@{#383425}

1 files changed, 5 insertions, 5 deletions

diff --git a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
index 57dcb78..efd29b4 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());
 
@@ -237,7 +237,7 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, Re
     const char data[6] = "abcde";
     cachedDeadResource->appendData(data, 3u);
     cachedDeadResource->finish();
-    MockImageResourceClient client(cachedLiveResource);
+    MockResourceClient client(cachedLiveResource);
     cachedLiveResource->appendData(data, 4u);
     cachedLiveResource->finish();
 
@@ -294,9 +294,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;