More POSIX support for Chromium, consisting mostly of broadening ifdefs. This

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 43 matching lines @@
   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()) {
     result.push_back(process_entry->pid());
   }
 
-#if defined(OS_LINUX)
-  // On Linux we might be running with a zygote process for the renderers.
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+  // On Unix 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());
   }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_POSIX)
   // 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());
   }
@@ skipping 22 matching lines @@
     base::ProcessHandle process) {
 #if !defined(OS_MACOSX)
   process_metrics_.reset(
       base::ProcessMetrics::CreateProcessMetrics(process));
 #else
   process_metrics_.reset(
       base::ProcessMetrics::CreateProcessMetrics(process, NULL));
 #endif
   process_handle_ = process;
 }