Merge 281795 "base: Add soft memory limit to DiscardableMemoryMa..."

base/memory/discardable_memory_android.cc

Index: base/memory/discardable_memory_android.cc
===================================================================
--- base/memory/discardable_memory_android.cc	(revision 283285)
+++ base/memory/discardable_memory_android.cc	(working copy)
@@ -32,7 +32,10 @@
 // Holds the shared state used for allocations.
 struct SharedState {
   SharedState()
-      : manager(kAshmemMemoryLimit, kAshmemMemoryLimit),
+      : manager(kAshmemMemoryLimit,
+                kAshmemMemoryLimit,
+                kAshmemMemoryLimit,
+                TimeDelta::Max()),
         allocator(kAshmemAllocatorName,
                   GetOptimalAshmemRegionSizeForAllocator()) {}
 
@@ -54,6 +57,11 @@
 }
 
 // static
+bool DiscardableMemory::ReduceMemoryUsage() {
+  return internal::DiscardableMemoryEmulated::ReduceMemoryUsage();
+}
+
+// static
 void DiscardableMemory::GetSupportedTypes(
     std::vector<DiscardableMemoryType>* types) {
   const DiscardableMemoryType supported_types[] = {