Update AshmemRegion::highest_allocated_chunk_ when merging free chunks.

base/memory/discardable_memory_allocator_android_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/discardable_memory_allocator_android.h"
 
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/memory/discardable_memory.h"
@@ skipping 253 matching lines @@
   // The last page of the first ashmem region should be used for this
   // allocation.
   scoped_ptr<DiscardableMemory> memory3(allocator_.Allocate(kPageSize));
   ASSERT_TRUE(memory3);
   WriteToDiscardableMemory(memory3.get(), kPageSize);
   EXPECT_EQ(memory3->Memory(), static_cast<char*>(memory1->Memory()) + size);
 }
 
 TEST_F(DiscardableMemoryAllocatorTest,
        HighestAllocatedChunkPointerIsUpdatedWhenHighestChunkGetsSplit) {
-  DiscardableMemoryAllocator allocator_(kAllocatorName, 32 * kPageSize);

[Philippe, 2014/03/05 15:36:03]

FYI, I just uploaded a patch set removing this (which was wrongly added in the
previous CL). |allocator_| is provided by the fixture class instead.

-
   // Prevents the ashmem region from getting closed when |memory2| gets freed.
   scoped_ptr<DiscardableMemory> memory1(allocator_.Allocate(kPageSize));
   ASSERT_TRUE(memory1);
 
   scoped_ptr<DiscardableMemory> memory2(allocator_.Allocate(4 * kPageSize));
   ASSERT_TRUE(memory2);
 
   memory2.reset();
   memory2 = allocator_.Allocate(kPageSize);
   // There should now be a free chunk of size 3 * |kPageSize| starting at offset
@@ skipping 10 matching lines @@
   // Deleting |memory3| (whose size is 4 * |kPageSize|) should result in a merge
   // with its previous chunk which is the free chunk of size |3 * kPageSize|.
   memory3.reset();
   memory3 = allocator_.Allocate((3 + 4) * kPageSize);
   EXPECT_EQ(memory3->Memory(),
             static_cast<const char*>(memory2->Memory()) + kPageSize);
 }
 
 }  // namespace internal
 }  // namespace base