Add ProcessMetrics::CreateCurrentProcessMetrics() method.

base/trace_event/process_memory_totals_dump_provider.cc

 // Copyright 2015 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/process_memory_totals_dump_provider.h"
 
 #include "base/process/process_metrics.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/process_memory_totals.h"
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
 #include <fcntl.h>
 
 #include "base/files/file_util.h"
 
 namespace {
 bool kernel_supports_rss_peak_reset = true;
 const char kClearPeakRssCommand[] = "5";
 }
 #endif
 
 namespace base {
 namespace trace_event {
 
 // static
 uint64 ProcessMemoryTotalsDumpProvider::rss_bytes_for_testing = 0;
 
-namespace {
-
-ProcessMetrics* CreateProcessMetricsForCurrentProcess() {
-#if !defined(OS_MACOSX) || defined(OS_IOS)
-  return ProcessMetrics::CreateProcessMetrics(GetCurrentProcessHandle());
-#else
-  return ProcessMetrics::CreateProcessMetrics(GetCurrentProcessHandle(), NULL);
-#endif
-}
-}  // namespace
-
 // static
 ProcessMemoryTotalsDumpProvider*
 ProcessMemoryTotalsDumpProvider::GetInstance() {
   return Singleton<
       ProcessMemoryTotalsDumpProvider,
       LeakySingletonTraits<ProcessMemoryTotalsDumpProvider>>::get();
 }
 
 ProcessMemoryTotalsDumpProvider::ProcessMemoryTotalsDumpProvider()
-    : process_metrics_(CreateProcessMetricsForCurrentProcess()) {
-}
+    : process_metrics_(ProcessMetrics::CreateCurrentProcessMetrics()) {}
 
 ProcessMemoryTotalsDumpProvider::~ProcessMemoryTotalsDumpProvider() {
 }
 
 // Called at trace dump point time. Creates a snapshot the memory counters for
 // the current process.
 bool ProcessMemoryTotalsDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
                                                    ProcessMemoryDump* pmd) {
   const uint64 rss_bytes = rss_bytes_for_testing
                                ? rss_bytes_for_testing
@@ skipping 25 matching lines @@
     pmd->process_totals()->set_peak_resident_set_bytes(peak_rss_bytes);
     pmd->set_has_process_totals();
     return true;
   }
 
   return false;
 }
 
 }  // namespace trace_event
 }  // namespace base