Cleanup metrics in memreport.py.

tools/android/memdump/memreport.py

Index: tools/android/memdump/memreport.py
diff --git a/tools/android/memdump/memreport.py b/tools/android/memdump/memreport.py
index fec213d1c02d8af6e671fc88e1414df9f358bd62..d4d8df5094a5e1c7f10e118889f09705f1b68c05 100755
--- a/tools/android/memdump/memreport.py
+++ b/tools/android/memdump/memreport.py
@@ -27,19 +27,16 @@ _ENTRIES = [
     ('Read-only', '.* r--. .*'),
     ('Read-write', '.* rw.. .*'),
     ('Executable', '.* ..x. .*'),
-    ('Anonymous total', '.* .... .* .*other=[0-9]+ ($|.*chromium:.*)'),
-    ('Anonymous read-write', '.* rw.. .* .*other=[0-9]+ ($|.*chromium:.*)'),
+    ('Anonymous total', '.* .... .* .*other=[0-9]+ $'),
+    ('Anonymous read-write', '.* rw.. .* .*other=[0-9]+ $'),
     ('Anonymous executable (JIT\'ed code)', '.* ..x. .* shared_other=[0-9]+ $'),
     ('File total', '.* .... .* /.*'),
     ('File read-write', '.* rw.. .* /.*'),
     ('File executable', '.* ..x. .* /.*'),
-    ('chromium mmap', '.* r... .*chromium:.*'),
-    ('chromium TransferBuffer', '.* r... .*chromium:.*CreateTransferBuffer.*'),
-    ('Galaxy Nexus GL driver', '.* r... .*pvrsrvkm.*'),
+    ('/dev files', '.* r... .* /dev/.*'),
     ('Dalvik', '.* rw.. .* /.*dalvik.*'),
     ('Dalvik heap', '.* rw.. .* /.*dalvik-heap.*'),
-    ('Native heap (jemalloc)', '.* r... .* /.*jemalloc.*'),
-    ('System heap', '.* r... .* \\[heap\\]'),
+    ('Native heap (malloc)', '.* r... .* .*malloc.*'),
     ('Ashmem', '.* rw.. .* /dev/ashmem .*'),
     ('libchromeview.so total', '.* r... .* /.*libchromeview.so'),
     ('libchromeview.so read-only', '.* r--. .* /.*libchromeview.so'),