Return unique_ptrs from base::ProcessMetrics.

chrome/browser/memory_details_win.cc

 // Copyright (c) 2012 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/memory_details.h"
 
 #include <psapi.h>
 #include <stddef.h>
 #include <TlHelp32.h>
 
@@ skipping 53 matching lines @@
     LOG(ERROR) << "Process32First failed: " << GetLastError();
     return;
   }
   do {
     base::ProcessId pid = process_entry.th32ProcessID;
     base::win::ScopedHandle process_handle(::OpenProcess(
         PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
     if (!process_handle.IsValid())
       continue;
     if (_wcsicmp(process_data_[0].process_name.c_str(),
-                 process_entry.szExeFile) != 0)
+                 process_entry.szExeFile) != 0) {
       continue;
+    }
+
     // Get Memory Information.
     ProcessMemoryInformation info;
     info.pid = pid;
-    if (info.pid == GetCurrentProcessId())
-      info.process_type = content::PROCESS_TYPE_BROWSER;
-    else
-      info.process_type = content::PROCESS_TYPE_UNKNOWN;
+    info.process_type = pid == GetCurrentProcessId()
+                            ? content::PROCESS_TYPE_BROWSER
+                            : content::PROCESS_TYPE_UNKNOWN;
 
-    std::unique_ptr<base::ProcessMetrics> metrics;
-    metrics.reset(
-        base::ProcessMetrics::CreateProcessMetrics(process_handle.Get()));
+    std::unique_ptr<base::ProcessMetrics> metrics =
+        base::ProcessMetrics::CreateProcessMetrics(process_handle.Get());
     metrics->GetCommittedKBytes(&info.committed);
     metrics->GetWorkingSetKBytes(&info.working_set);
 
     // Get Version Information.
     info.version = base::ASCIIToUTF16(version_info::GetVersionNumber());
     // Check if this is one of the child processes whose data we collected
     // on the IO thread, and if so copy over that data.
-    for (size_t child = 0; child < child_info.size(); child++) {
-      if (child_info[child].pid != info.pid)
-        continue;
-      info.titles = child_info[child].titles;
-      info.process_type = child_info[child].process_type;
-      break;
+    for (const ProcessMemoryInformation& child : child_info) {
+      if (child.pid == info.pid) {
+        info.titles = child.titles;
+        info.process_type = child.process_type;
+        break;
+      }
     }
 
     // Add the process info to our list.
     process_data_[0].processes.push_back(info);
   } while (::Process32Next(snapshot.Get(), &process_entry));
 
   // Finally return to the browser thread.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this));
 }