Chromium -> Mojo roll.

base/trace_event/process_memory_maps_dump_provider_unittest.cc

Index: base/trace_event/process_memory_maps_dump_provider_unittest.cc
diff --git a/base/trace_event/process_memory_maps_dump_provider_unittest.cc b/base/trace_event/process_memory_maps_dump_provider_unittest.cc
index 02fd13637dcfa9fde44c13170d93bec385ed381b..0bf81acfd0e5e94e1ae1387da3d94b72c5c16a25 100644
--- a/base/trace_event/process_memory_maps_dump_provider_unittest.cc
+++ b/base/trace_event/process_memory_maps_dump_provider_unittest.cc
@@ -36,12 +36,12 @@ const char kTestSmaps1[] =
     "VmFlags: rd ex mr mw me dw sd\n"
     "ff000000-ff800000 -w-p 00001080 fc:01 0            /file/name with space\n"
     "Size:                  0 kB\n"
-    "Rss:                 128 kB\n"
+    "Rss:                 192 kB\n"
     "Pss:                 128 kB\n"
-    "Shared_Clean:        124 kB\n"
-    "Shared_Dirty:          0 kB\n"
-    "Private_Clean:        68 kB\n"
-    "Private_Dirty:         0 kB\n"
+    "Shared_Clean:        120 kB\n"
+    "Shared_Dirty:          4 kB\n"
+    "Private_Clean:        60 kB\n"
+    "Private_Dirty:         8 kB\n"
     "Referenced:          296 kB\n"
     "Anonymous:             0 kB\n"
     "AnonHugePages:         0 kB\n"
@@ -91,7 +91,7 @@ const char kTestSmaps2[] =
     "7fe7ce79c000-7fe7ce7a8000 ---p 00000000 00:00 0 \n"
     "Size:                 48 kB\n"
     "Rss:                  40 kB\n"
-    "Pss:                   0 kB\n"
+    "Pss:                  32 kB\n"
     "Shared_Clean:         16 kB\n"
     "Shared_Dirty:         12 kB\n"
     "Private_Clean:         8 kB\n"
@@ -141,17 +141,17 @@ TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) {
   EXPECT_EQ(0x004be000UL - 0x00400000UL, regions_1[0].size_in_bytes);
   EXPECT_EQ(kProtR | kProtX, regions_1[0].protection_flags);
   EXPECT_EQ("/file/1", regions_1[0].mapped_file);
-  EXPECT_EQ(0UL, regions_1[0].mapped_file_offset);
-  EXPECT_EQ(296 * 1024UL, regions_1[0].byte_stats_resident);
-  EXPECT_EQ(68 * 1024UL, regions_1[0].byte_stats_anonymous);
+  EXPECT_EQ(162 * 1024UL, regions_1[0].byte_stats_proportional_resident);
+  EXPECT_EQ((228 + 0) * 1024UL, regions_1[0].byte_stats_shared_resident);
+  EXPECT_EQ((0 + 68) * 1024UL, regions_1[0].byte_stats_private_resident);
 
   EXPECT_EQ(0xff000000UL, regions_1[1].start_address);
   EXPECT_EQ(0xff800000UL - 0xff000000UL, regions_1[1].size_in_bytes);
   EXPECT_EQ(kProtW, regions_1[1].protection_flags);
   EXPECT_EQ("/file/name with space", regions_1[1].mapped_file);
-  EXPECT_EQ(0x00001080UL, regions_1[1].mapped_file_offset);
-  EXPECT_EQ(128 * 1024UL, regions_1[1].byte_stats_resident);
-  EXPECT_EQ(0UL, regions_1[1].byte_stats_anonymous);
+  EXPECT_EQ(128 * 1024UL, regions_1[1].byte_stats_proportional_resident);
+  EXPECT_EQ((120 + 4) * 1024UL, regions_1[1].byte_stats_shared_resident);
+  EXPECT_EQ((60 + 8) * 1024UL, regions_1[1].byte_stats_private_resident);
 
   // Parse the 2nd smaps file.
   ProcessMemoryDump pmd_2;
@@ -165,9 +165,9 @@ TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) {
   EXPECT_EQ(0x7fe7ce7a8000UL - 0x7fe7ce79c000UL, regions_2[0].size_in_bytes);
   EXPECT_EQ(0U, regions_2[0].protection_flags);
   EXPECT_EQ("", regions_2[0].mapped_file);
-  EXPECT_EQ(0UL, regions_2[0].mapped_file_offset);
-  EXPECT_EQ(40 * 1024UL, regions_2[0].byte_stats_resident);
-  EXPECT_EQ(16 * 1024UL, regions_2[0].byte_stats_anonymous);
+  EXPECT_EQ(32 * 1024UL, regions_2[0].byte_stats_proportional_resident);
+  EXPECT_EQ((16 + 12) * 1024UL, regions_2[0].byte_stats_shared_resident);
+  EXPECT_EQ((8 + 4) * 1024UL, regions_2[0].byte_stats_private_resident);
 }
 #endif  // defined(OS_LINUX) || defined(OS_ANDROID)