Move some ResourceClients for testing to Oilpan heap

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 15 matching lines @@
  * 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/MemoryCache.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "platform/SharedBuffer.h"
+#include "platform/heap/Handle.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLResponse.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 TEST(RawResourceTest, DontIgnoreAcceptForCacheReuse)
 {
     ResourceRequest jpegRequest;
     jpegRequest.setHTTPAccept("image/jpeg");
 
     RawResource* jpegResource(RawResource::create(jpegRequest, Resource::Raw));
 
     ResourceRequest pngRequest;
     pngRequest.setHTTPAccept("image/png");
 
     ASSERT_FALSE(jpegResource->canReuse(pngRequest));
 }
 
-class DummyClient final : public RawResourceClient {
+class DummyClient final : public GarbageCollectedFinalized<DummyClient>, public RawResourceClient {
 public:
     DummyClient() : m_called(false) {}
     ~DummyClient() override {}
 
     // ResourceClient implementation.
     void notifyFinished(Resource* resource) override
     {
         m_called = true;
     }
     String debugName() const override { return "DummyClient"; }
 
     void dataReceived(Resource*, const char* data, size_t length) override
     {
         m_data.append(data, length);
     }
 
     bool called() { return m_called; }
     const Vector<char>& data() { return m_data; }
+    DEFINE_INLINE_TRACE() {}
+
 private:
     bool m_called;
     Vector<char> m_data;
 };
 
 // This client adds another client when notified.
-class AddingClient : public RawResourceClient {
+class AddingClient final : public GarbageCollectedFinalized<AddingClient>, public RawResourceClient {
 public:
     AddingClient(DummyClient* client, Resource* resource)
         : m_dummyClient(client)
         , m_resource(resource)
         , m_removeClientTimer(this, &AddingClient::removeClient) {}
 
     ~AddingClient() override {}
 
     // ResourceClient implementation.
     void notifyFinished(Resource* resource) override
     {
         // First schedule an asynchronous task to remove the client.
         // We do not expect the client to be called.
         m_removeClientTimer.startOneShot(0, BLINK_FROM_HERE);
         resource->addClient(m_dummyClient);
     }
     String debugName() const override { return "AddingClient"; }
 
     void removeClient(Timer<AddingClient>* timer)
     {
         m_resource->removeClient(m_dummyClient);
     }
+
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        visitor->trace(m_dummyClient);
+        visitor->trace(m_resource);
+    }
+
 private:
-    DummyClient* m_dummyClient;
-    Persistent<Resource> m_resource;
+    Member<DummyClient> m_dummyClient;
+    Member<Resource> m_resource;
     Timer<AddingClient> m_removeClientTimer;
 };
 
 TEST(RawResourceTest, RevalidationSucceeded)
 {
     Resource* resource = RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
     ResourceResponse response;
     response.setHTTPStatusCode(200);
     resource->responseReceived(response, nullptr);
     const char data[5] = "abcd";
     resource->appendData(data, 4);
     resource->finish();
     memoryCache()->add(resource);
 
     // Simulate a successful revalidation.
     resource->setRevalidatingRequest(ResourceRequest("data:text/html,"));
 
-    OwnPtr<DummyClient> client = adoptPtr(new DummyClient);
-    resource->addClient(client.get());
+    Persistent<DummyClient> client = new DummyClient;
+    resource->addClient(client);
 
     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);
     memoryCache()->remove(resource);
 
-    resource->removeClient(client.get());
+    resource->removeClient(client);
     EXPECT_FALSE(resource->hasClientsOrObservers());
     EXPECT_FALSE(client->called());
     EXPECT_EQ("abcd", String(client->data().data(), client->data().size()));
 }
 
 TEST(RawResourceTest, RevalidationSucceededForResourceWithoutBody)
 {
     Resource* resource = RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
     ResourceResponse response;
     response.setHTTPStatusCode(200);
     resource->responseReceived(response, nullptr);
     resource->finish();
     memoryCache()->add(resource);
 
     // Simulate a successful revalidation.
     resource->setRevalidatingRequest(ResourceRequest("data:text/html,"));
 
-    OwnPtr<DummyClient> client = adoptPtr(new DummyClient);
-    resource->addClient(client.get());
+    Persistent<DummyClient> client = new DummyClient;
+    resource->addClient(client);
 
     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);
     memoryCache()->remove(resource);
 
-    resource->removeClient(client.get());
+    resource->removeClient(client);
     EXPECT_FALSE(resource->hasClientsOrObservers());
     EXPECT_FALSE(client->called());
     EXPECT_EQ(0u, client->data().size());
 }
 
 TEST(RawResourceTest, RevalidationSucceededUpdateHeaders)
 {
     Resource* resource = RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
     ResourceResponse response;
     response.setHTTPStatusCode(200);
@@ skipping 12 matching lines @@
 
     // Validate that these headers pre-update.
     EXPECT_EQ("keep-alive value", resource->response().httpHeaderField("keep-alive"));
     EXPECT_EQ("expires value", resource->response().httpHeaderField("expires"));
     EXPECT_EQ("last-modified value", resource->response().httpHeaderField("last-modified"));
     EXPECT_EQ("proxy-authenticate value", resource->response().httpHeaderField("proxy-authenticate"));
     EXPECT_EQ("proxy-authenticate value", resource->response().httpHeaderField("proxy-authenticate"));
     EXPECT_EQ("proxy-connection value", resource->response().httpHeaderField("proxy-connection"));
     EXPECT_EQ("custom value", resource->response().httpHeaderField("x-custom"));
 
-    OwnPtr<DummyClient> client = adoptPtr(new DummyClient);
+    Persistent<DummyClient> client = new DummyClient;
     resource->addClient(client.get());
 
     // Perform a revalidation step.
     ResourceResponse revalidatingResponse;
     revalidatingResponse.setHTTPStatusCode(304);
     // Headers that aren't copied with an 304 code.
     revalidatingResponse.addHTTPHeaderField("keep-alive", "garbage");
     revalidatingResponse.addHTTPHeaderField("expires", "garbage");
     revalidatingResponse.addHTTPHeaderField("last-modified", "garbage");
     revalidatingResponse.addHTTPHeaderField("proxy-authenticate", "garbage");
     revalidatingResponse.addHTTPHeaderField("proxy-connection", "garbage");
     // Header that is updated with 304 code.
     revalidatingResponse.addHTTPHeaderField("x-custom", "updated");
     resource->responseReceived(revalidatingResponse, nullptr);
 
     // Validate the original response.
     EXPECT_EQ(200, resource->response().httpStatusCode());
 
     // Validate that these headers are not updated.
     EXPECT_EQ("keep-alive value", resource->response().httpHeaderField("keep-alive"));
     EXPECT_EQ("expires value", resource->response().httpHeaderField("expires"));
     EXPECT_EQ("last-modified value", resource->response().httpHeaderField("last-modified"));
     EXPECT_EQ("proxy-authenticate value", resource->response().httpHeaderField("proxy-authenticate"));
     EXPECT_EQ("proxy-authenticate value", resource->response().httpHeaderField("proxy-authenticate"));
     EXPECT_EQ("proxy-connection value", resource->response().httpHeaderField("proxy-connection"));
     EXPECT_EQ("updated", resource->response().httpHeaderField("x-custom"));
 
     memoryCache()->remove(resource);
 
-    resource->removeClient(client.get());
+    resource->removeClient(client);
     EXPECT_FALSE(resource->hasClientsOrObservers());
     EXPECT_FALSE(client->called());
     EXPECT_EQ(0u, client->data().size());
 }
 
 TEST(RawResourceTest, AddClientDuringCallback)
 {
     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));
-    raw->addClient(addingClient.get());
+    Persistent<DummyClient> dummyClient = new DummyClient();
+    Persistent<AddingClient> addingClient = new AddingClient(dummyClient.get(), raw);
+    raw->addClient(addingClient);
     testing::runPendingTasks();
-    raw->removeClient(addingClient.get());
+    raw->removeClient(addingClient);
     EXPECT_FALSE(dummyClient->called());
     EXPECT_FALSE(raw->hasClientsOrObservers());
 }
 
 // This client removes another client when notified.
-class RemovingClient : public RawResourceClient {
+class RemovingClient : public GarbageCollectedFinalized<RemovingClient>, public RawResourceClient {
 public:
     RemovingClient(DummyClient* client)
         : m_dummyClient(client) {}
 
     ~RemovingClient() override {}
 
     // ResourceClient implementation.
     void notifyFinished(Resource* resource) override
     {
         resource->removeClient(m_dummyClient);
         resource->removeClient(this);
     }
     String debugName() const override { return "RemovingClient"; }
+    DEFINE_INLINE_TRACE()
+    {
+        visitor->trace(m_dummyClient);
+    }
+
 private:
-    DummyClient* m_dummyClient;
+    Member<DummyClient> m_dummyClient;
 };
 
 TEST(RawResourceTest, RemoveClientDuringCallback)
 {
     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<RemovingClient> removingClient = adoptPtr(new RemovingClient(dummyClient.get()));
-    raw->addClient(dummyClient.get());
-    raw->addClient(removingClient.get());
+    Persistent<DummyClient> dummyClient = new DummyClient();
+    Persistent<RemovingClient> removingClient = new RemovingClient(dummyClient.get());
+    raw->addClient(dummyClient);
+    raw->addClient(removingClient);
     testing::runPendingTasks();
     EXPECT_FALSE(raw->hasClientsOrObservers());
 }
 
 TEST(RawResourceTest, CanReuseDevToolsEmulateNetworkConditionsClientIdHeader)
 {
     ResourceRequest request("data:text/html,");
     request.setHTTPHeaderField(HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id, "Foo");
     Resource* raw = RawResource::create(request, Resource::Raw);
     EXPECT_TRUE(raw->canReuse(ResourceRequest("data:text/html,")));
 }
 
 } // namespace blink