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

base/trace_event.cc

 // Copyright (c) 2006-2008 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 "base/trace_event.h"
 
 #include "base/format_macros.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 11 matching lines @@
   "BEGIN",
   "END",
   "INSTANT"
 };
 
 static const FilePath::CharType* kLogFileName =
     FILE_PATH_LITERAL("trace_%d.log");
 
 TraceLog::TraceLog() : enabled_(false), log_file_(NULL) {
   base::ProcessHandle proc = base::GetCurrentProcessHandle();
-#if !defined(OS_MACOSX)
   process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(proc));
-#else
-  // The default port provider is sufficient to get data for the current
-  // process.
-  process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(proc,
-                                                                    NULL));
-#endif
 }
 
 TraceLog::~TraceLog() {
   Stop();
 }
 
 // static
 bool TraceLog::IsTracing() {
   TraceLog* trace = Singleton<TraceLog>::get();
   return trace->enabled_;
@@ skipping 105 matching lines @@
   Log(msg);
 }
 
 void TraceLog::Log(const std::string& msg) {
   AutoLock lock(file_lock_);
 
   fprintf(log_file_, "%s", msg.c_str());
 }
 
 } // namespace base