| Index: content/common/discardable_shared_memory_heap_unittest.cc
|
| diff --git a/content/common/discardable_shared_memory_heap_unittest.cc b/content/common/discardable_shared_memory_heap_unittest.cc
|
| index 5297ded0cc49a2fb903189feb1bfd2683cda8957..ee5582741167de5024555039c065dfbc4cd67ff0 100644
|
| --- a/content/common/discardable_shared_memory_heap_unittest.cc
|
| +++ b/content/common/discardable_shared_memory_heap_unittest.cc
|
| @@ -37,7 +37,7 @@ TEST(DiscardableSharedMemoryHeapTest, Basic) {
|
|
|
| // Create new span for memory.
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> new_span(
|
| - heap.Grow(memory.Pass(), memory_size, base::Bind(NullTask)));
|
| + heap.Grow(memory.Pass(), memory_size, 0, base::Bind(NullTask)));
|
|
|
| // Size should match |memory_size|.
|
| EXPECT_EQ(memory_size, heap.GetSize());
|
| @@ -80,7 +80,7 @@ TEST(DiscardableSharedMemoryHeapTest, SplitAndMerge) {
|
| new base::DiscardableSharedMemory);
|
| ASSERT_TRUE(memory->CreateAndMap(memory_size));
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> new_span(
|
| - heap.Grow(memory.Pass(), memory_size, base::Bind(NullTask)));
|
| + heap.Grow(memory.Pass(), memory_size, 0, base::Bind(NullTask)));
|
|
|
| // Split span into two.
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> leftover =
|
| @@ -135,7 +135,7 @@ TEST(DiscardableSharedMemoryHeapTest, MergeSingleBlockSpan) {
|
| new base::DiscardableSharedMemory);
|
| ASSERT_TRUE(memory->CreateAndMap(memory_size));
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> new_span(
|
| - heap.Grow(memory.Pass(), memory_size, base::Bind(NullTask)));
|
| + heap.Grow(memory.Pass(), memory_size, 0, base::Bind(NullTask)));
|
|
|
| // Split span into two.
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> leftover =
|
| @@ -157,7 +157,7 @@ TEST(DiscardableSharedMemoryHeapTest, Grow) {
|
| new base::DiscardableSharedMemory);
|
| ASSERT_TRUE(memory1->CreateAndMap(block_size));
|
| heap.MergeIntoFreeLists(
|
| - heap.Grow(memory1.Pass(), block_size, base::Bind(NullTask)).Pass());
|
| + heap.Grow(memory1.Pass(), block_size, 0, base::Bind(NullTask)).Pass());
|
|
|
| // Remove a span from free lists.
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> span1 =
|
| @@ -172,7 +172,7 @@ TEST(DiscardableSharedMemoryHeapTest, Grow) {
|
| new base::DiscardableSharedMemory);
|
| ASSERT_TRUE(memory2->CreateAndMap(block_size));
|
| heap.MergeIntoFreeLists(
|
| - heap.Grow(memory2.Pass(), block_size, base::Bind(NullTask)).Pass());
|
| + heap.Grow(memory2.Pass(), block_size, 1, base::Bind(NullTask)).Pass());
|
|
|
| // Memory should now be available.
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> span2 =
|
| @@ -192,7 +192,7 @@ TEST(DiscardableSharedMemoryHeapTest, ReleaseFreeMemory) {
|
| new base::DiscardableSharedMemory);
|
| ASSERT_TRUE(memory->CreateAndMap(block_size));
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> span =
|
| - heap.Grow(memory.Pass(), block_size, base::Bind(NullTask));
|
| + heap.Grow(memory.Pass(), block_size, 0, base::Bind(NullTask));
|
|
|
| // Free lists should be empty.
|
| EXPECT_EQ(0u, heap.GetSizeOfFreeLists());
|
| @@ -218,7 +218,7 @@ TEST(DiscardableSharedMemoryHeapTest, ReleasePurgedMemory) {
|
| new base::DiscardableSharedMemory);
|
| ASSERT_TRUE(memory->CreateAndMap(block_size));
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> span =
|
| - heap.Grow(memory.Pass(), block_size, base::Bind(NullTask));
|
| + heap.Grow(memory.Pass(), block_size, 0, base::Bind(NullTask));
|
|
|
| // Unlock memory so it can be purged.
|
| span->shared_memory()->Unlock(0, 0);
|
| @@ -246,7 +246,7 @@ TEST(DiscardableSharedMemoryHeapTest, Slack) {
|
| new base::DiscardableSharedMemory);
|
| ASSERT_TRUE(memory->CreateAndMap(memory_size));
|
| heap.MergeIntoFreeLists(
|
| - heap.Grow(memory.Pass(), memory_size, base::Bind(NullTask)).Pass());
|
| + heap.Grow(memory.Pass(), memory_size, 0, base::Bind(NullTask)).Pass());
|
|
|
| // No free span that is less or equal to 3 + 1.
|
| EXPECT_FALSE(heap.SearchFreeLists(3, 1));
|
| @@ -277,7 +277,7 @@ TEST(DiscardableSharedMemoryHeapTest, DeletedCallback) {
|
| ASSERT_TRUE(memory->CreateAndMap(block_size));
|
| bool deleted = false;
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> span =
|
| - heap.Grow(memory.Pass(), block_size,
|
| + heap.Grow(memory.Pass(), block_size, 0,
|
| base::Bind(OnDeleted, base::Unretained(&deleted)));
|
|
|
| heap.MergeIntoFreeLists(span.Pass());
|
|
|