Revert 34994, maybe it regressed startup perf - Fix cpu/memory measurements o...

chrome/browser/task_manager.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 515 matching lines @@
                   resources_.end(),
                   (*group_entries)[group_entries->size() - 2]);
     DCHECK(iter != resources_.end());
     new_entry_index = static_cast<int>(iter - resources_.begin());
     resources_.insert(++iter, 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;
   }
 
   // Notify the table that the contents have changed for it to redraw.
   FOR_EACH_OBSERVER(TaskManagerModelObserver, observer_list_,
                     OnItemsAdded(new_entry_index, 1));
 }
 
 void TaskManagerModel::RemoveResource(TaskManager::Resource* resource) {
   base::ProcessHandle process = resource->GetProcess();
@@ skipping 216 matching lines @@
 // notifications. Every time we get notified some bytes were read we bump a
 // counter of read bytes for the associated resource. When the timer ticks,
 // we'll compute the actual network usage (see the Refresh method).
 void TaskManagerModel::OnJobAdded(URLRequestJob* job) {
 }
 
 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) {
   int render_process_host_child_id = -1, routing_id = -1;
   ResourceDispatcherHost::RenderViewForRequest(job->request(),
                                                &render_process_host_child_id,
                                                &routing_id);
   // This happens in the IO thread, post it to the UI thread.
   int origin_child_id =
       chrome_browser_net::GetOriginProcessUniqueIDForRequest(job->request());
@@ skipping 95 matching lines @@
   // or popup, we can only have one tab, hence we need to process this in a
   // tabbed browser window. Currently, |browser| is pointing to the application,
   // popup window. Therefore, we have to retrieve the last active tab again,
   // since a new window has been used.
   if (browser->type() & Browser::TYPE_APP_POPUP) {
     browser = BrowserList::GetLastActive();
     DCHECK(browser);
   }
   browser->window()->Show();
 }