Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2397)

Unified Diff: chrome/test/chrome_process_util.h

Issue 500118: Fix cpu/memory measurements on OS X. (Closed)
Patch Set: foobar Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/chrome_process_util.h
diff --git a/chrome/test/chrome_process_util.h b/chrome/test/chrome_process_util.h
index 19a5446ddb72e8d3c4fcd2bb36a840c31bff8999..4fb151374bd7dffa899a9a2a6af5a4dd3d61ca3d 100644
--- a/chrome/test/chrome_process_util.h
+++ b/chrome/test/chrome_process_util.h
@@ -57,7 +57,12 @@ class ChromeTestProcessMetrics {
private:
explicit ChromeTestProcessMetrics(base::ProcessHandle process) {
- process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(process));
+ process_metrics_.reset(
+#if !defined(OS_MACOSX)
+ base::ProcessMetrics::CreateProcessMetrics(process));
+#else
+ base::ProcessMetrics::CreateProcessMetrics(process, NULL));
+#endif
process_handle_ = process;
}

Powered by Google App Engine
This is Rietveld 408576698