Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2236)

Unified Diff: third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp

Issue 1998073002: Move some ResourceClients for testing to Oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
index 8d6631f210bf643532c642e6cec4772c0bd9007b..a66426a3f705eaaed58f98268872276d169b3e95 100644
--- a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
@@ -133,7 +133,7 @@ TEST_F(MemoryCacheTest, VeryLargeResourceAccounting)
ASSERT_EQ(cachedResource->size(), memoryCache()->deadSize());
ASSERT_EQ(0u, memoryCache()->liveSize());
- MockResourceClient client(cachedResource);
+ Persistent<MockResourceClient> client = new MockResourceClient(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();
- MockResourceClient client(cachedLiveResource);
+ Persistent<MockResourceClient> client = new MockResourceClient(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";
- MockResourceClient client1(resource1);
+ Persistent<MockResourceClient> client1 = new MockResourceClient(resource1);
resource1->appendData(data, 4u);
- MockResourceClient client2(resource2);
+ Persistent<MockResourceClient> client2 = new MockResourceClient(resource2);
resource2->appendData(data, 4u);
const unsigned minDeadCapacity = 0;
@@ -315,7 +315,7 @@ static void TestClientRemoval(Resource* resource1, Resource* resource2)
// Removing the client from resource1 should result in all resources
// remaining in cache since the prune is deferred.
- client1.removeAsClient();
+ client1->removeAsClient();
ASSERT_GT(resource1->decodedSize(), 0u);
ASSERT_GT(resource2->decodedSize(), 0u);
ASSERT_EQ(memoryCache()->deadSize(), resource1->size());
@@ -325,7 +325,7 @@ static void TestClientRemoval(Resource* resource1, Resource* resource2)
// Removing the client from resource2 should result in immediate
// eviction of resource2 because we are over the prune deferral limit.
- client2.removeAsClient();
+ client2->removeAsClient();
ASSERT_GT(resource1->decodedSize(), 0u);
ASSERT_GT(resource2->decodedSize(), 0u);
ASSERT_EQ(memoryCache()->deadSize(), resource1->size());

Powered by Google App Engine
This is Rietveld 408576698