base: Add soft memory limit to DiscardableMemoryManager.

base/memory/discardable_memory_android.cc

 // Copyright (c) 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.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 
 size_t GetOptimalAshmemRegionSizeForAllocator() {
   // Note that this may do some I/O (without hitting the disk though) so it
   // should not be called on the critical path.
   return base::SysInfo::AmountOfPhysicalMemory() / 8;
 }
 
 // Holds the shared state used for allocations.
 struct SharedState {
   SharedState()
-      : manager(kAshmemMemoryLimit, kAshmemMemoryLimit),
+      : manager(kAshmemMemoryLimit,
+                kAshmemMemoryLimit,
+                kAshmemMemoryLimit,
+                TimeDelta::Max()),
         allocator(kAshmemAllocatorName,
                   GetOptimalAshmemRegionSizeForAllocator()) {}
 
   internal::DiscardableMemoryManager manager;
   internal::DiscardableMemoryAshmemAllocator allocator;
 };
 LazyInstance<SharedState>::Leaky g_shared_state = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // static
 void DiscardableMemory::RegisterMemoryPressureListeners() {
   internal::DiscardableMemoryEmulated::RegisterMemoryPressureListeners();
 }
 
 // static
 void DiscardableMemory::UnregisterMemoryPressureListeners() {
   internal::DiscardableMemoryEmulated::UnregisterMemoryPressureListeners();
 }
 
 // static
+bool DiscardableMemory::ReduceMemoryUsage() {
+  return internal::DiscardableMemoryEmulated::ReduceMemoryUsage();
+}
+
+// static
 void DiscardableMemory::GetSupportedTypes(
     std::vector<DiscardableMemoryType>* types) {
   const DiscardableMemoryType supported_types[] = {
     DISCARDABLE_MEMORY_TYPE_ASHMEM,
     DISCARDABLE_MEMORY_TYPE_EMULATED,
     DISCARDABLE_MEMORY_TYPE_MALLOC
   };
   types->assign(supported_types, supported_types + arraysize(supported_types));
 }
 
@@ skipping 36 matching lines @@
   return scoped_ptr<DiscardableMemory>();
 }
 
 // static
 void DiscardableMemory::PurgeForTesting() {
   g_shared_state.Pointer()->manager.PurgeAll();
   internal::DiscardableMemoryEmulated::PurgeForTesting();
 }
 
 }  // namespace base