Update MemoryMonitorChromeOS

content/browser/memory/memory_monitor_chromeos_unittest.cc

Index: content/browser/memory/memory_monitor_chromeos_unittest.cc
diff --git a/content/browser/memory/memory_monitor_chromeos_unittest.cc b/content/browser/memory/memory_monitor_chromeos_unittest.cc
index 733d03999a9751cac903c48b8ec559517528bb1a..fb7265e8c1dbd361fe6e11f59367455548a51a67 100644
--- a/content/browser/memory/memory_monitor_chromeos_unittest.cc
+++ b/content/browser/memory/memory_monitor_chromeos_unittest.cc
@@ -20,12 +20,14 @@ class TestMemoryMonitorChromeOSDelegate : public TestMemoryMonitorDelegate {
                        int swap_kb,
                        int active_kb,
                        int inactive_kb,
-                       int dirty_kb) {
+                       int dirty_kb,
+                       int available_kb) {
     mem_info_.free = free_kb;
     mem_info_.swap_free = swap_kb;
     mem_info_.active_file = active_kb;
     mem_info_.inactive_file = inactive_kb;
     mem_info_.dirty = dirty_kb;
+    mem_info_.available = available_kb;
   }
 
  private:
@@ -56,10 +58,17 @@ TEST_F(MemoryMonitorChromeOSTest, GetFreeMemoryUntilCriticalMB) {
   monitor_.reset(new MemoryMonitorChromeOS(&delegate_));
   EXPECT_EQ(0u, delegate_.calls());
 
+  // |available| is supported.
   delegate_.SetFreeMemoryKB(256 * kKBperMB, 128 * kKBperMB, 64 * kKBperMB,
-                            32 * kKBperMB, 16 * kKBperMB);
-  EXPECT_EQ(318, monitor_->GetFreeMemoryUntilCriticalMB());
+                            32 * kKBperMB, 16 * kKBperMB, 512 * kKBperMB);

[Wez, 2017/03/08 01:59:06]

Consider passing in more obviously-wrong values for the other fields, so that
it's clear that this test won't pass if the 512MiB isn't used by the function.

[bashi, 2017/03/10 01:59:10]

Done.

+  EXPECT_EQ(512, monitor_->GetFreeMemoryUntilCriticalMB());
   EXPECT_EQ(1U, delegate_.calls());
+
+  // |available| is not supported.

[Wez, 2017/03/08 01:59:05]

It seems it would be useful to verify here that the result is the same, for a
given level of memory use, for a kernel that supports |available| vs one that
doesn't?

[bashi, 2017/03/10 01:59:10]

Done.

+  delegate_.SetFreeMemoryKB(256 * kKBperMB, 128 * kKBperMB, 64 * kKBperMB,
+                            32 * kKBperMB, 16 * kKBperMB, 0 * kKBperMB);
+  EXPECT_EQ(286, monitor_->GetFreeMemoryUntilCriticalMB());
+  EXPECT_EQ(2U, delegate_.calls());
 }
 
 }  // namespace content