summaryrefslogtreecommitdiffstats
path: root/chrome/test/perf
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-07 00:06:09 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-07 00:06:09 +0000
commit1b24910060de853baf83173faf3c1cab2f4c4617 (patch)
tree3b60d9bf81c56cea298c16271f637be6d015a1c1 /chrome/test/perf
parent7e786822892d2e10c75c3ddc47df057d5fc275c2 (diff)
downloadchromium_src-1b24910060de853baf83173faf3c1cab2f4c4617.zip
chromium_src-1b24910060de853baf83173faf3c1cab2f4c4617.tar.gz
chromium_src-1b24910060de853baf83173faf3c1cab2f4c4617.tar.bz2
For memory_test:
Change the RESULT output format. Add an option to collect memory statistics after each navigation. Fix a type error in Linux CommitCharge calculation. BUG=none TEST=none Review URL: http://codereview.chromium.org/376005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
-rw-r--r--chrome/test/perf/mem_usage_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/perf/mem_usage_linux.cc b/chrome/test/perf/mem_usage_linux.cc
index 568b4fc..35b5773 100644
--- a/chrome/test/perf/mem_usage_linux.cc
+++ b/chrome/test/perf/mem_usage_linux.cc
@@ -45,7 +45,7 @@ size_t GetSystemCommitCharge() {
DCHECK_EQ(meminfo_fields[kMemBuffersIndex-1], "Buffers:");
DCHECK_EQ(meminfo_fields[kMemCacheIndex-1], "Cached:");
- int result_in_kb;
+ size_t result_in_kb;
result_in_kb = StringToInt(meminfo_fields[kMemTotalIndex]);
result_in_kb -= StringToInt(meminfo_fields[kMemFreeIndex]);
result_in_kb -= StringToInt(meminfo_fields[kMemBuffersIndex]);