diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 04:50:04 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 04:50:04 +0000 |
commit | 3740cb9b54f6a5d28c3501b650b7c179101568eb (patch) | |
tree | 848c46b9b75018e0fc60edf715e068bf5cc87c24 /chrome/browser/safe_browsing | |
parent | 0ec9512a65f8d7f15dbddd902363994660d85ffb (diff) | |
download | chromium_src-3740cb9b54f6a5d28c3501b650b7c179101568eb.zip chromium_src-3740cb9b54f6a5d28c3501b650b7c179101568eb.tar.gz chromium_src-3740cb9b54f6a5d28c3501b650b7c179101568eb.tar.bz2 |
Revert 35025 - Revert 34994, maybe it regressed startup perf Fix cpu/memory measurements on OS X.
Right now, this only works for the current process; support for child processes will be added in a later CL.
BUG=13156,25454
TEST=Hook up task manager (connect menu item to commandDispatch:, give it the right tag). Stats for the browser process should now be right, and %cpu should be 0 (for now) for all other processes.
Review URL: http://codereview.chromium.org/500118
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/504068
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/505056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
-rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_database_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc index 3d244c0..30f9de4 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc @@ -1078,7 +1078,12 @@ void PeformUpdate(const std::wstring& initial_db, Time before_time = Time::Now(); base::ProcessHandle handle = base::Process::Current().handle(); scoped_ptr<base::ProcessMetrics> metric( +#if !defined(OS_MACOSX) base::ProcessMetrics::CreateProcessMetrics(handle)); +#else + // Getting stats only for the current process is enough, so NULL is fine. + base::ProcessMetrics::CreateProcessMetrics(handle, NULL)); +#endif CHECK(metric->GetIOCounters(&before)); std::vector<SBListChunkRanges> lists; |