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

chrome/test/chrome_process_util.h

 // 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.
 
 #ifndef CHROME_TEST_CHROME_PROCESS_UTIL_H_
 #define CHROME_TEST_CHROME_PROCESS_UTIL_H_
 
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 39 matching lines @@
   }
 
   bool GetIOCounters(IoCounters* io_counters) {
     return process_metrics_->GetIOCounters(io_counters);
   }
 
   base::ProcessHandle process_handle_;
 
  private:
   explicit ChromeTestProcessMetrics(base::ProcessHandle process) {
-    process_metrics_.reset(
-#if !defined(OS_MACOSX)
-        base::ProcessMetrics::CreateProcessMetrics(process));
-#else
-        base::ProcessMetrics::CreateProcessMetrics(process, NULL));
-#endif
+    process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(process));
     process_handle_ = process;
   }
 
   scoped_ptr<base::ProcessMetrics> process_metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeTestProcessMetrics);
 };
 
 #if defined(OS_MACOSX)
 
@@ skipping 14 matching lines @@
 
 typedef std::vector<MacChromeProcessInfo> MacChromeProcessInfoList;
 
 // Any ProcessId that info can't be found for will be left out.
 MacChromeProcessInfoList GetRunningMacProcessInfo(
                                         const ChromeProcessList &process_list);
 
 #endif  // defined(OS_MACOSX)
 
 #endif  // CHROME_TEST_CHROME_PROCESS_UTIL_H_