| Index: base/process/process_metrics_unittest.cc
|
| diff --git a/base/process/process_metrics_unittest.cc b/base/process/process_metrics_unittest.cc
|
| index 3e059b48a45f565f0bbe6f12060a19e8ada834f6..d3e14d23a73af21232d4009e89781435d4cb9fd4 100644
|
| --- a/base/process/process_metrics_unittest.cc
|
| +++ b/base/process/process_metrics_unittest.cc
|
| @@ -106,6 +106,7 @@ TEST_F(SystemMetricsTest, ParseMeminfo) {
|
| std::string valid_input1 =
|
| "MemTotal: 3981504 kB\n"
|
| "MemFree: 140764 kB\n"
|
| + "MemAvailable: 2746720 kB\n"
|
| "Buffers: 116480 kB\n"
|
| "Cached: 406160 kB\n"
|
| "SwapCached: 21304 kB\n"
|
| @@ -171,6 +172,7 @@ TEST_F(SystemMetricsTest, ParseMeminfo) {
|
| EXPECT_TRUE(ParseProcMeminfo(valid_input1, &meminfo));
|
| EXPECT_EQ(meminfo.total, 3981504);
|
| EXPECT_EQ(meminfo.free, 140764);
|
| + EXPECT_EQ(meminfo.available, 2746720);
|
| EXPECT_EQ(meminfo.buffers, 116480);
|
| EXPECT_EQ(meminfo.cached, 406160);
|
| EXPECT_EQ(meminfo.active_anon, 2972352);
|
| @@ -180,13 +182,16 @@ TEST_F(SystemMetricsTest, ParseMeminfo) {
|
| EXPECT_EQ(meminfo.swap_total, 5832280);
|
| EXPECT_EQ(meminfo.swap_free, 3672368);
|
| EXPECT_EQ(meminfo.dirty, 184);
|
| + EXPECT_EQ(meminfo.reclaimable, 30936);
|
| #if defined(OS_CHROMEOS)
|
| EXPECT_EQ(meminfo.shmem, 140204);
|
| EXPECT_EQ(meminfo.slab, 54212);
|
| #endif
|
| + meminfo = {};
|
| EXPECT_TRUE(ParseProcMeminfo(valid_input2, &meminfo));
|
| EXPECT_EQ(meminfo.total, 255908);
|
| EXPECT_EQ(meminfo.free, 69936);
|
| + EXPECT_EQ(meminfo.available, 0);
|
| EXPECT_EQ(meminfo.buffers, 15812);
|
| EXPECT_EQ(meminfo.cached, 115124);
|
| EXPECT_EQ(meminfo.swap_total, 524280);
|
| @@ -341,7 +346,7 @@ TEST_F(SystemMetricsTest, TestNoNegativeCpuUsage) {
|
|
|
| #endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
|
| -#if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \
|
| +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) || \
|
| defined(OS_LINUX) || defined(OS_ANDROID)
|
| TEST(SystemMetrics2Test, GetSystemMemoryInfo) {
|
| SystemMemoryInfoKB info;
|
| @@ -350,6 +355,9 @@ TEST(SystemMetrics2Test, GetSystemMemoryInfo) {
|
| // Ensure each field received a value.
|
| EXPECT_GT(info.total, 0);
|
| EXPECT_GT(info.free, 0);
|
| +#if defined(OS_WIN)
|
| + EXPECT_GT(info.available, 0);
|
| +#endif
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| EXPECT_GT(info.buffers, 0);
|
| EXPECT_GT(info.cached, 0);
|
| @@ -370,6 +378,10 @@ TEST(SystemMetrics2Test, GetSystemMemoryInfo) {
|
| EXPECT_LT(info.inactive_file, info.total);
|
| #endif // defined(OS_LINUX) || defined(OS_ANDROID)
|
|
|
| +#if defined(OS_MACOSX) || defined(OS_IOS)
|
| + EXPECT_GT(info.file_backed, 0);
|
| +#endif
|
| +
|
| #if defined(OS_CHROMEOS)
|
| // Chrome OS exposes shmem.
|
| EXPECT_GT(info.shmem, 0);
|
| @@ -378,7 +390,7 @@ TEST(SystemMetrics2Test, GetSystemMemoryInfo) {
|
| // and gem_size cannot be tested here.
|
| #endif
|
| }
|
| -#endif // defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) ||
|
| +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) ||
|
| // defined(OS_LINUX) || defined(OS_ANDROID)
|
|
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
|
|