Loading: split MockResourceClients into multiple files type by type

This patch splits MockResourceClients into MockResourceClient and
MockImageResourceClient, because MemoryCacheTest and ResourceFetcherTest
just need MockResourceClient and do not want to depend on
MockImageResourceClient that has a dependency to ImageResource.

BUG=655920

Review-Url: https://codereview.chromium.org/2559703002
Cr-Commit-Position: refs/heads/master@{#438109}

third_party/WebKit/Source/core/BUILD.gn

@@ -1148,8 +1148,10 @@ source_set("unit_tests") {
     "fetch/MemoryCacheCorrectnessTestHelper.h",
     "fetch/MemoryCacheTest.cpp",
     "fetch/MockFetchContext.h",
-    "fetch/MockResourceClients.cpp",
-    "fetch/MockResourceClients.h",
+    "fetch/MockImageResourceClient.cpp",
+    "fetch/MockImageResourceClient.h",
+    "fetch/MockResourceClient.cpp",
+    "fetch/MockResourceClient.h",
     "fetch/MultipartImageResourceParserTest.cpp",
     "fetch/RawResourceTest.cpp",
     "fetch/ResourceFetcherTest.cpp",

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

@@ -33,7 +33,8 @@
 #include "core/fetch/FetchInitiatorInfo.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/MemoryCache.h"
-#include "core/fetch/MockResourceClients.h"
+#include "core/fetch/MockImageResourceClient.h"
+#include "core/fetch/MockResourceClient.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourceLoader.h"
 #include "core/fetch/UniqueIdentifier.h"

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

@@ -30,7 +30,7 @@
 
 #include "core/fetch/MemoryCache.h"
 
-#include "core/fetch/MockResourceClients.h"
+#include "core/fetch/MockResourceClient.h"
 #include "core/fetch/RawResource.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/testing/UnitTestHelpers.h"

third_party/WebKit/Source/core/fetch/MockResourceClients.cpp → third_party/WebKit/Source/core/fetch/MockImageResourceClient.cpp

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fetch/MockResourceClients.h"
+#include "core/fetch/MockImageResourceClient.h"
 
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/ImageResourceContent.h"
@@ -10,39 +10,6 @@
 
 namespace blink {
 
-MockResourceClient::MockResourceClient(Resource* resource)
-    : m_resource(resource),
-      m_notifyFinishedCalled(false),
-      m_encodedSizeOnNotifyFinished(0) {
-  ThreadState::current()->registerPreFinalizer(this);
-  m_resource->addClient(this);
-}
-
-MockResourceClient::~MockResourceClient() {}
-
-void MockResourceClient::notifyFinished(Resource* resource) {
-  ASSERT_FALSE(m_notifyFinishedCalled);
-  m_notifyFinishedCalled = true;
-  m_encodedSizeOnNotifyFinished = resource->encodedSize();
-}
-
-void MockResourceClient::removeAsClient() {
-  m_resource->removeClient(this);
-  m_resource = nullptr;
-}
-
-void MockResourceClient::dispose() {
-  if (m_resource) {
-    m_resource->removeClient(this);
-    m_resource = nullptr;
-  }
-}
-
-DEFINE_TRACE(MockResourceClient) {
-  visitor->trace(m_resource);
-  ResourceClient::trace(visitor);
-}
-
 MockImageResourceClient::MockImageResourceClient(ImageResource* resource)
     : MockResourceClient(resource),
       m_imageChangedCount(0),

third_party/WebKit/Source/core/fetch/MockImageResourceClient.h

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MockImageResourceClient_h
+#define MockImageResourceClient_h
+
+#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
+#include "core/fetch/ImageResourceObserver.h"
+#include "core/fetch/MockResourceClient.h"
+
+namespace blink {
+
+class MockImageResourceClient final : public MockResourceClient,
+                                      public ImageResourceObserver {
+ public:
+  explicit MockImageResourceClient(ImageResource*);
+  ~MockImageResourceClient() override;
+
+  void imageNotifyFinished(ImageResourceContent*) override;
+  void imageChanged(ImageResourceContent*, const IntRect*) override;
+
+  String debugName() const override { return "MockImageResourceClient"; }
+
+  bool notifyFinishedCalled() const override;
+
+  void removeAsClient() override;
+  void dispose() override;
+
+  int imageChangedCount() const { return m_imageChangedCount; }
+  int imageNotifyFinishedCount() const { return m_imageNotifyFinishedCount; }
+
+  size_t encodedSizeOnLastImageChanged() const {
+    return m_encodedSizeOnLastImageChanged;
+  }
+  size_t encodedSizeOnImageNotifyFinished() const {
+    return m_encodedSizeOnImageNotifyFinished;
+  }
+
+ private:
+  int m_imageChangedCount;
+  size_t m_encodedSizeOnLastImageChanged;
+  int m_imageNotifyFinishedCount;
+  size_t m_encodedSizeOnImageNotifyFinished;
+};
+
+}  // namespace blink
+
+#endif  // MockImageResourceClient_h

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

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "core/fetch/MockResourceClient.h"
+
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace blink {
+
+MockResourceClient::MockResourceClient(Resource* resource)
+    : m_resource(resource),
+      m_notifyFinishedCalled(false),
+      m_encodedSizeOnNotifyFinished(0) {
+  ThreadState::current()->registerPreFinalizer(this);
+  m_resource->addClient(this);
+}
+
+MockResourceClient::~MockResourceClient() {}
+
+void MockResourceClient::notifyFinished(Resource* resource) {
+  ASSERT_FALSE(m_notifyFinishedCalled);
+  m_notifyFinishedCalled = true;
+  m_encodedSizeOnNotifyFinished = resource->encodedSize();
+}
+
+void MockResourceClient::removeAsClient() {
+  m_resource->removeClient(this);
+  m_resource = nullptr;
+}
+
+void MockResourceClient::dispose() {
+  if (m_resource) {
+    m_resource->removeClient(this);
+    m_resource = nullptr;
+  }
+}
+
+DEFINE_TRACE(MockResourceClient) {
+  visitor->trace(m_resource);
+  ResourceClient::trace(visitor);
+}
+
+}  // namespace blink

third_party/WebKit/Source/core/fetch/MockResourceClients.h → third_party/WebKit/Source/core/fetch/MockResourceClient.h

@@ -28,12 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MockResourceClients_h
-#define MockResourceClients_h
+#ifndef MockResourceClient_h
+#define MockResourceClient_h
 
-#include "core/fetch/ImageResource.h"
-#include "core/fetch/ImageResourceContent.h"
-#include "core/fetch/ImageResourceObserver.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceClient.h"
 #include "platform/heap/Handle.h"
@@ -68,39 +65,6 @@ class MockResourceClient : public GarbageCollectedFinalized<MockResourceClient>,
   size_t m_encodedSizeOnNotifyFinished;
 };
 
-class MockImageResourceClient final : public MockResourceClient,
-                                      public ImageResourceObserver {
- public:
-  explicit MockImageResourceClient(ImageResource*);
-  ~MockImageResourceClient() override;
-
-  void imageNotifyFinished(ImageResourceContent*) override;
-  void imageChanged(ImageResourceContent*, const IntRect*) override;
-
-  String debugName() const override { return "MockImageResourceClient"; }
-
-  bool notifyFinishedCalled() const override;
-
-  void removeAsClient() override;
-  void dispose() override;
-
-  int imageChangedCount() const { return m_imageChangedCount; }
-  int imageNotifyFinishedCount() const { return m_imageNotifyFinishedCount; }
-
-  size_t encodedSizeOnLastImageChanged() const {
-    return m_encodedSizeOnLastImageChanged;
-  }
-  size_t encodedSizeOnImageNotifyFinished() const {
-    return m_encodedSizeOnImageNotifyFinished;
-  }
-
- private:
-  int m_imageChangedCount;
-  size_t m_encodedSizeOnLastImageChanged;
-  int m_imageNotifyFinishedCount;
-  size_t m_encodedSizeOnImageNotifyFinished;
-};
-
 }  // namespace blink
 
-#endif  // MockResourceClients_h
+#endif  // MockResourceClient_h

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

@@ -36,7 +36,7 @@
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/MockFetchContext.h"
-#include "core/fetch/MockResourceClients.h"
+#include "core/fetch/MockResourceClient.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceLoader.h"
 #include "platform/WebTaskRunner.h"

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

@@ -8,6 +8,7 @@
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/MockFetchContext.h"
+#include "core/fetch/MockResourceClient.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourceLoader.h"
 #include "core/loader/resource/MockFontResourceClient.h"