Use DiscardableMemoryManager on Android.

base/memory/discardable_memory_manager.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_manager.h"
 
 #include "base/containers/hash_tables.h"
 #include "base/containers/mru_cache.h"
 #include "base/debug/trace_event.h"
 #include "base/synchronization/lock.h"
@@ skipping 102 matching lines @@
 }
 
 void DiscardableMemoryManager::Unlock(AllocationId allocation_id) {
   AutoLock lock(lock_);
   // NB: |allocations_| is an MRU cache, and use of |Get| here updates that
   // cache.
   AllocationMap::iterator it = allocations_.Get(allocation_id);
   CHECK(it != allocations_.end());
 
   DCHECK(it->second.allocation.get());
+  it->second.allocation->Unlock();

[Philippe, 2014/03/20 17:10:14]

FYI: I need to do a rebase here.

   DCHECK(it->second.locked);
   it->second.locked = false;
   EnforcePolicyWithLockAcquired();
 }
 
 void DiscardableMemoryManager::PurgeUntilUsageIsWithin(size_t limit) {
   AutoLock lock(lock_);
   PurgeLRUWithLockAcquiredUntilUsageIsWithin(limit);
 }
 
@@ skipping 41 matching lines @@
     it->second.allocation.reset();
   }
 }
 
 void DiscardableMemoryManager::EnforcePolicyWithLockAcquired() {
   PurgeLRUWithLockAcquiredUntilUsageIsWithin(discardable_memory_limit_);
 }
 
 }  // namespace internal
 }  // namespace base