Reduce the in-memory blob storgae limit on Android

storage/browser/blob/blob_memory_controller.cc

 // Copyright 2016 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 "storage/browser/blob/blob_memory_controller.h"
 
 #include <algorithm>
 #include <numeric>
 
 #include "base/bind.h"
@@ skipping 35 matching lines @@
 using MemoryAllocation = BlobMemoryController::MemoryAllocation;
 using QuotaAllocationTask = BlobMemoryController::QuotaAllocationTask;
 using DiskSpaceFuncPtr = BlobMemoryController::DiskSpaceFuncPtr;
 
 // CrOS:
 // * Ram -  20%
 // * Disk - 50%
 //   Note: The disk is the user partition, so the operating system can still
 //   function if this is full.
 // Android:
-// * RAM -  20%
-// * Disk -  5%
+// * RAM -  1%
+// * Disk -  6%
 // Desktop:
 // * Ram -  20%, or 2 GB if x64.
 // * Disk - 10%
 BlobStorageLimits CalculateBlobStorageLimitsImpl(const FilePath& storage_dir,
                                                  bool disk_enabled) {
   int64_t disk_size =
       disk_enabled ? base::SysInfo::AmountOfTotalDiskSpace(storage_dir) : 0ull;
   int64_t memory_size = base::SysInfo::AmountOfPhysicalMemory();
 
   BlobStorageLimits limits;
 
   // Don't do specialty configuration for error size (-1).
   if (memory_size > 0) {
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)
     constexpr size_t kTwoGigabytes = 2ull * 1024 * 1024 * 1024;
     limits.max_blob_in_memory_space = kTwoGigabytes;
+#elif defined(OS_ANDROID)
+    limits.max_blob_in_memory_space = static_cast<size_t>(memory_size / 100ll);
 #else
     limits.max_blob_in_memory_space = static_cast<size_t>(memory_size / 5ll);
 #endif
   }
 
   // Don't do specialty configuration for error size (-1). Allow no disk.
   if (disk_size >= 0) {
 #if defined(OS_CHROMEOS)
     limits.desired_max_disk_space = static_cast<uint64_t>(disk_size / 2ll);
 #elif defined(OS_ANDROID)
-    limits.desired_max_disk_space = static_cast<uint64_t>(disk_size / 20ll);
+    limits.desired_max_disk_space =
+        static_cast<uint64_t>(6 * disk_size / 1000ll);

[dmurph, 2017/05/03 21:58:19]

How about doing "3ll * disk_size  / 50" (6%, tries to prevent overflow, and
corrects from .6%)

 #else
     limits.desired_max_disk_space = static_cast<uint64_t>(disk_size / 10ll);
 #endif
   }
   UMA_HISTOGRAM_COUNTS_1M("Storage.Blob.MaxDiskSpace",
                           limits.desired_max_disk_space / kMegabyte);
   limits.effective_max_disk_space = limits.desired_max_disk_space;
 
   return limits;
 }
@@ skipping 880 matching lines @@
   MaybeGrantPendingMemoryRequests();
 }
 
 void BlobMemoryController::OnBlobFileDelete(uint64_t size,
                                             const FilePath& path) {
   DCHECK_LE(size, disk_used_);
   disk_used_ -= size;
 }
 
 }  // namespace storage