Move common code into process_util.cc

chrome/test/chrome_process_util.cc

 // Copyright (c) 2010 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/chrome_process_util.h"
 
 #include <vector>
 #include <set>
 
 #include "base/process_util.h"
@@ skipping 40 matching lines @@
 }
 
 class ChildProcessFilter : public base::ProcessFilter {
  public:
   explicit ChildProcessFilter(base::ProcessId parent_pid)
       : parent_pids_(&parent_pid, (&parent_pid) + 1) {}
 
   explicit ChildProcessFilter(std::vector<base::ProcessId> parent_pids)
       : parent_pids_(parent_pids.begin(), parent_pids.end()) {}
 
-  virtual bool Includes(base::ProcessId pid, base::ProcessId parent_pid) const {
-    return parent_pids_.find(parent_pid) != parent_pids_.end();
+  virtual bool Includes(const base::ProcessEntry& entry) const {
+    return parent_pids_.find(entry.parent_pid()) != parent_pids_.end();
   }
 
  private:
   const std::set<base::ProcessId> parent_pids_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessFilter);
 };
 
 ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
   ChromeProcessList result;
   if (browser_pid == static_cast<base::ProcessId>(-1))
     return result;
 
   ChildProcessFilter filter(browser_pid);
   base::NamedProcessIterator it(chrome::kBrowserProcessExecutableName, &filter);
   while (const base::ProcessEntry* process_entry = it.NextProcessEntry()) {
-#if defined(OS_WIN)
-    result.push_back(process_entry->th32ProcessID);
-#elif defined(OS_POSIX)
-    result.push_back(process_entry->pid);
-#endif
+    result.push_back(process_entry->pid());
   }
 
 #if defined(OS_LINUX)
   // On Linux we might be running with a zygote process for the renderers.
   // Because of that we sweep the list of processes again and pick those which
   // are children of one of the processes that we've already seen.
   {
     ChildProcessFilter filter(result);
     base::NamedProcessIterator it(chrome::kBrowserProcessExecutableName,
                                   &filter);
     while (const base::ProcessEntry* process_entry = it.NextProcessEntry())
-      result.push_back(process_entry->pid);
+      result.push_back(process_entry->pid());
   }
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   // On Mac OS X we run the subprocesses with a different bundle, and
   // on Linux via /proc/self/exe, so they end up with a different
   // name.  We must collect them in a second pass.
   {
     ChildProcessFilter filter(browser_pid);
     base::NamedProcessIterator it(chrome::kHelperProcessExecutableName,
                                   &filter);
     while (const base::ProcessEntry* process_entry = it.NextProcessEntry())
-      result.push_back(process_entry->pid);
+      result.push_back(process_entry->pid());
   }
 #endif  // defined(OS_MACOSX)
 
   result.push_back(browser_pid);
 
   return result;
 }
 
 #if !defined(OS_MACOSX)
 
 size_t ChromeTestProcessMetrics::GetPagefileUsage() {
   return process_metrics_->GetPagefileUsage();
 }
 
 size_t ChromeTestProcessMetrics::GetWorkingSetSize() {
   return process_metrics_->GetWorkingSetSize();
 }
 
 #endif  // !defined(OS_MACOSX)