diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 06:57:28 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 06:57:28 +0000 |
| commit | ed26d948be84443236a8a165ac2a3ccf63c2e02a (patch) | |
| tree | a41de5ad3954557cbf9a7b0e1bc61c923fc05269 /chrome/test/memory_test | |
| parent | ad33fd4bdd8b7117e2644b34f553a2f14faea653 (diff) | |
| download | chromium_src-ed26d948be84443236a8a165ac2a3ccf63c2e02a.zip chromium_src-ed26d948be84443236a8a165ac2a3ccf63c2e02a.tar.gz chromium_src-ed26d948be84443236a8a165ac2a3ccf63c2e02a.tar.bz2 | |
More memory stats code cleanup:
Move GetSystemCommitCharge() into bsae\process_util*.
Kill PrintChromeMemoryUsageInfo(), which was only used by
reliability_tests.exe on Windows and whose stats are obsolete.
Delete the now-unnecessary chrome\test\perf\mem_usage* files.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/371025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/memory_test')
| -rw-r--r-- | chrome/test/memory_test/memory_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc index 3c55d9a..8134c80 100644 --- a/chrome/test/memory_test/memory_test.cc +++ b/chrome/test/memory_test/memory_test.cc @@ -18,7 +18,6 @@ #include "chrome/test/automation/window_proxy.h" #include "chrome/test/chrome_process_util.h" #include "chrome/test/ui/ui_test.h" -#include "chrome/test/perf/mem_usage.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -135,7 +134,7 @@ class MemoryTest : public UITest { // Record the initial CommitCharge. This is a system-wide measurement, // so if other applications are running, they can create variance in this // test. - size_t start_size = GetSystemCommitCharge(); + size_t start_size = base::GetSystemCommitCharge(); // Cycle through the URLs. scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); @@ -221,8 +220,8 @@ class MemoryTest : public UITest { PlatformThread::Sleep(100); } - size_t stop_size = GetSystemCommitCharge(); - PrintResults(test_name, stop_size - start_size); + size_t stop_size = base::GetSystemCommitCharge(); + PrintResults(test_name, (stop_size - start_size) / 1024); } void PrintResults(const char* test_name, size_t commit_size) { |