diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 00:27:05 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 00:27:05 +0000 |
| commit | 4d507cb452633af4b5ebc5226839d0fc3e214489 (patch) | |
| tree | 6da4d425b76bb32f42fbe704d9a6d5be57f666aa /chrome/test/perf/mem_usage_linux.cc | |
| parent | 84bbb2b55d8ae1a517b16cb358803ccf1de745c1 (diff) | |
| download | chromium_src-4d507cb452633af4b5ebc5226839d0fc3e214489.zip chromium_src-4d507cb452633af4b5ebc5226839d0fc3e214489.tar.gz chromium_src-4d507cb452633af4b5ebc5226839d0fc3e214489.tar.bz2 | |
Revert 31333 - 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
TBR=vandebo@chromium.org
Review URL: http://codereview.chromium.org/374020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf/mem_usage_linux.cc')
| -rw-r--r-- | chrome/test/perf/mem_usage_linux.cc | 2 |
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 35b5773..568b4fc 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:"); - size_t result_in_kb; + int result_in_kb; result_in_kb = StringToInt(meminfo_fields[kMemTotalIndex]); result_in_kb -= StringToInt(meminfo_fields[kMemFreeIndex]); result_in_kb -= StringToInt(meminfo_fields[kMemBuffersIndex]); |