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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34994 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 3 deletions

diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index 43952a5..edd7b37 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -533,7 +533,14 @@ void TaskManagerModel::AddResource(TaskManager::Resource* resource) {
   // Create the ProcessMetrics for this process if needed (not in map).
   if (metrics_map_.find(process) == metrics_map_.end()) {
     base::ProcessMetrics* pm =
+#if !defined(OS_MACOSX)
         base::ProcessMetrics::CreateProcessMetrics(process);
+#else
+        // TODO(thakis): Write a port provider that knows the task ports of
+        // child processes.
+        base::ProcessMetrics::CreateProcessMetrics(process, NULL);
+#endif
+
     metrics_map_[process] = pm;
   }
 
@@ -770,12 +777,12 @@ void TaskManagerModel::OnJobRemoved(URLRequestJob* job) {
 }
 
 void TaskManagerModel::OnJobDone(URLRequestJob* job,
-                                      const URLRequestStatus& status) {
+                                 const URLRequestStatus& status) {
 }
 
 void TaskManagerModel::OnJobRedirect(URLRequestJob* job,
-                                          const GURL& location,
-                                          int status_code) {
+                                     const GURL& location,
+                                     int status_code) {
 }
 
 void TaskManagerModel::OnBytesRead(URLRequestJob* job, int byte_count) {