Return unique_ptrs from base::ProcessMetrics.

chrome/test/base/chrome_process_util.cc

 // Copyright (c) 2011 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/test/base/chrome_process_util.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/process/process.h"
 #include "base/process/process_iterator.h"
+#include "base/process/process_metrics.h"
+#include "base/stl_util.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/test_switches.h"
 #include "content/public/common/result_codes.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 void TerminateAllChromeProcesses(const ChromeProcessList& process_pids) {
-  ChromeProcessList::const_iterator it;
-  for (it = process_pids.begin(); it != process_pids.end(); ++it) {
-    base::Process process = base::Process::Open(*it);
+  for (auto pid : process_pids) {
+    base::Process process = base::Process::Open(pid);
     if (process.IsValid()) {
       // Ignore processes for which we can't open the handle. We don't
       // guarantee that all processes will terminate, only try to do so.
       process.Terminate(content::RESULT_CODE_KILLED, true);
     }
   }
 }
 
 class ChildProcessFilter : public base::ProcessFilter {
  public:
   explicit ChildProcessFilter(base::ProcessId parent_pid)
       : parent_pids_(&parent_pid, (&parent_pid) + 1) {}
 
   explicit ChildProcessFilter(const std::vector<base::ProcessId>& parent_pids)
       : parent_pids_(parent_pids.begin(), parent_pids.end()) {}
 
   bool Includes(const base::ProcessEntry& entry) const override {
-    return parent_pids_.find(entry.parent_pid()) != parent_pids_.end();
+    return ContainsKey(parent_pids_, entry.parent_pid());
   }
 
  private:
   const std::set<base::ProcessId> parent_pids_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessFilter);
 };
 
 ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
   const base::FilePath::CharType* executable_name =
@@ skipping 47 matching lines @@
 size_t ChromeTestProcessMetrics::GetWorkingSetSize() {
   return process_metrics_->GetWorkingSetSize();
 }
 
 #endif  // !defined(OS_MACOSX)
 
 ChromeTestProcessMetrics::~ChromeTestProcessMetrics() {}
 
 ChromeTestProcessMetrics::ChromeTestProcessMetrics(
     base::ProcessHandle process) {
-#if !defined(OS_MACOSX)
-  process_metrics_.reset(
-      base::ProcessMetrics::CreateProcessMetrics(process));
+#if defined(OS_MACOSX)
+  process_metrics_ =
+      base::ProcessMetrics::CreateProcessMetrics(process, nullptr);
 #else
-  process_metrics_.reset(
-      base::ProcessMetrics::CreateProcessMetrics(process, NULL));
+  process_metrics_ = base::ProcessMetrics::CreateProcessMetrics(process);
 #endif
   process_handle_ = process;
 }
+
+size_t ChromeTestProcessMetrics::GetPeakPagefileUsage() {
+  return process_metrics_->GetPeakPagefileUsage();
+}
+
+size_t ChromeTestProcessMetrics::GetPeakWorkingSetSize() {
+  return process_metrics_->GetPeakWorkingSetSize();
+}
+
+bool ChromeTestProcessMetrics::GetIOCounters(base::IoCounters* io_counters) {
+  return process_metrics_->GetIOCounters(io_counters);
+}