Move some ResourceClients for testing to Oilpan heap

third_party/WebKit/Source/core/fetch/ResourceFetcherTest.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 197 matching lines @@
     ASSERT_TRUE(resource->hasVaryHeader());
 
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
     EXPECT_EQ(resource, newResource);
 
     memoryCache()->remove(newResource);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
-class RequestSameResourceOnComplete : public RawResourceClient {
+class RequestSameResourceOnComplete : public GarbageCollectedFinalized<RequestSameResourceOnComplete>, public RawResourceClient {
 public:
     explicit RequestSameResourceOnComplete(Resource* resource)
         : m_resource(resource)
         , m_notifyFinishedCalled(false)
     {
     }
 
     void notifyFinished(Resource* resource) override
     {
         ASSERT_EQ(m_resource, resource);
         ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchContext::create();
         context->setCachePolicy(CachePolicyRevalidate);
         ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
         FetchRequest fetchRequest2(m_resource->url(), FetchInitiatorInfo());
         Resource* resource2 = fetcher2->requestResource(fetchRequest2, TestResourceFactory(Resource::Image));
         EXPECT_EQ(m_resource, resource2);
         m_notifyFinishedCalled = true;
     }
     bool notifyFinishedCalled() const { return m_notifyFinishedCalled; }
 
+    DEFINE_INLINE_TRACE()
+    {
+        visitor->trace(m_resource);
+    }
+
     String debugName() const override { return "RequestSameResourceOnComplete"; }
 
 private:
-    Persistent<Resource> m_resource;
+    Member<Resource> m_resource;
     bool m_notifyFinishedCalled;
 };
 
 TEST_F(ResourceFetcherTest, RevalidateWhileFinishingLoading)
 {
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     ResourceResponse response;
     response.setURL(url);
     response.setHTTPStatusCode(200);
     response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
     response.setHTTPHeaderField(HTTPNames::ETag, "1234567890");
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, WrappedResourceResponse(response), "");
 
     ResourceFetcher* fetcher1 = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     ResourceRequest request1(url);
     request1.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");
     FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo());
     Resource* resource1 = fetcher1->requestResource(fetchRequest1, TestResourceFactory(Resource::Image));
-    RequestSameResourceOnComplete client(resource1);
-    resource1->addClient(&client);
+    Persistent<RequestSameResourceOnComplete> client = new RequestSameResourceOnComplete(resource1);
+    resource1->addClient(client);
     Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
-    EXPECT_TRUE(client.notifyFinishedCalled());
-    resource1->removeClient(&client);
+    EXPECT_TRUE(client->notifyFinishedCalled());
+    resource1->removeClient(client);
     memoryCache()->remove(resource1);
 }
 
 TEST_F(ResourceFetcherTest, DontReuseMediaDataUrl)
 {
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     ResourceRequest request(KURL(ParsedURLString, "data:text/html,foo"));
     ResourceLoaderOptions options;
     options.dataBufferingPolicy = DoNotBufferData;
     FetchRequest fetchRequest = FetchRequest(request, FetchInitiatorTypeNames::internal, options);
     Resource* resource1 = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Media));
     Resource* resource2 = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Media));
     EXPECT_NE(resource1, resource2);
     memoryCache()->remove(resource2);
 }
 
-class ServeRequestsOnCompleteClient : public RawResourceClient {
+class ServeRequestsOnCompleteClient final : public GarbageCollectedFinalized<ServeRequestsOnCompleteClient>, public RawResourceClient {
 public:
     void notifyFinished(Resource*) override
     {
         Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
     }
 
     // No callbacks should be received except for the notifyFinished()
     // triggered by ResourceLoader::cancel().
     void dataSent(Resource*, unsigned long long, unsigned long long) override { ASSERT_TRUE(false); }
     void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override { ASSERT_TRUE(false); }
     void setSerializedCachedMetadata(Resource*, const char*, size_t) override { ASSERT_TRUE(false); }
     void dataReceived(Resource*, const char*, size_t) override { ASSERT_TRUE(false); }
     void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) override { ASSERT_TRUE(false); }
     void dataDownloaded(Resource*, int) override { ASSERT_TRUE(false); }
     void didReceiveResourceTiming(Resource*, const ResourceTimingInfo&) override { ASSERT_TRUE(false); }
 
+    DEFINE_INLINE_TRACE() {}
+
     String debugName() const override { return "ServeRequestsOnCompleteClient"; }
 };
 
 // Regression test for http://crbug.com/594072.
 // This emulates a modal dialog triggering a nested run loop inside
 // ResourceLoader::cancel(). If the ResourceLoader doesn't promptly cancel its
 // WebURLLoader before notifying its clients, a nested run loop  may send a
 // network response, leading to an invalid state transition in ResourceLoader.
 TEST_F(ResourceFetcherTest, ResponseOnCancel)
 {
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     ResourceResponse response;
     response.setURL(url);
     response.setHTTPStatusCode(200);
     URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, "white-1x1.png", WebString::fromUTF8(""), WrappedResourceResponse(response));
 
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Raw));
-    ServeRequestsOnCompleteClient client;
-    resource->addClient(&client);
+    Persistent<ServeRequestsOnCompleteClient> client = new ServeRequestsOnCompleteClient();
+    resource->addClient(client);
     resource->loader()->cancel();
+    resource->removeClient(client);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
 } // namespace blink