Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/fetch/RawResource.h"
 
-#include "core/fetch/ImageResourceClient.h"
 #include "core/fetch/MemoryCache.h"
-#include "core/fetch/MockImageResourceClient.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "platform/SharedBuffer.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
@@ skipping 85 matching lines @@
     ResourceResponse revalidatingResponse;
     revalidatingResponse.setHTTPStatusCode(304);
     resource->responseReceived(revalidatingResponse, nullptr);
     EXPECT_FALSE(resource->isCacheValidator());
     EXPECT_EQ(200, resource->response().httpStatusCode());
     EXPECT_EQ(4u, resource->resourceBuffer()->size());
     EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")), resource.get());
     memoryCache()->remove(resource.get());
 
     resource->removeClient(client.get());
-    EXPECT_FALSE(resource->hasClients());
+    EXPECT_FALSE(resource->hasClientsOrObservers());
     EXPECT_FALSE(client->called());
     EXPECT_EQ("abcd", String(client->data().data(), client->data().size()));
 }
 
 TEST(RawResourceTest, RevalidationSucceededForResourceWithoutBody)
 {
     RefPtrWillBeRawPtr<Resource> resource = RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
     ResourceResponse response;
     response.setHTTPStatusCode(200);
     resource->responseReceived(response, nullptr);
     resource->finish();
     memoryCache()->add(resource.get());
 
     // Simulate a successful revalidation.
     resource->setRevalidatingRequest(ResourceRequest("data:text/html,"));
 
     OwnPtr<DummyClient> client = adoptPtr(new DummyClient);
     resource->addClient(client.get());
 
     ResourceResponse revalidatingResponse;
     revalidatingResponse.setHTTPStatusCode(304);
     resource->responseReceived(revalidatingResponse, nullptr);
     EXPECT_FALSE(resource->isCacheValidator());
     EXPECT_EQ(200, resource->response().httpStatusCode());
     EXPECT_EQ(nullptr, resource->resourceBuffer());
     EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")), resource.get());
     memoryCache()->remove(resource.get());
 
     resource->removeClient(client.get());
-    EXPECT_FALSE(resource->hasClients());
+    EXPECT_FALSE(resource->hasClientsOrObservers());
     EXPECT_FALSE(client->called());
     EXPECT_EQ(0u, client->data().size());
 }
 
 TEST(RawResourceTest, AddClientDuringCallback)
 {
     RefPtrWillBeRawPtr<Resource> raw = RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
 
     // Create a non-null response.
     ResourceResponse response = raw->response();
     response.setURL(KURL(ParsedURLString, "http://600.613/"));
     raw->setResponse(response);
     raw->finish();
     EXPECT_FALSE(raw->response().isNull());
 
     OwnPtr<DummyClient> dummyClient = adoptPtr(new DummyClient());
     OwnPtr<AddingClient> addingClient = adoptPtr(new AddingClient(dummyClient.get(), raw.get()));
     raw->addClient(addingClient.get());
     testing::runPendingTasks();
     raw->removeClient(addingClient.get());
     EXPECT_FALSE(dummyClient->called());
-    EXPECT_FALSE(raw->hasClients());
+    EXPECT_FALSE(raw->hasClientsOrObservers());
 }
 
 // This client removes another client when notified.
 class RemovingClient : public RawResourceClient {
 public:
     RemovingClient(DummyClient* client)
         : m_dummyClient(client) {}
 
     ~RemovingClient() override {}
 
@@ skipping 17 matching lines @@
     response.setURL(KURL(ParsedURLString, "http://600.613/"));
     raw->setResponse(response);
     raw->finish();
     EXPECT_FALSE(raw->response().isNull());
 
     OwnPtr<DummyClient> dummyClient = adoptPtr(new DummyClient());
     OwnPtr<RemovingClient> removingClient = adoptPtr(new RemovingClient(dummyClient.get()));
     raw->addClient(dummyClient.get());
     raw->addClient(removingClient.get());
     testing::runPendingTasks();
-    EXPECT_FALSE(raw->hasClients());
+    EXPECT_FALSE(raw->hasClientsOrObservers());
 }
 
 } // namespace blink