Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Unified Diff: chrome/test/chrome_process_util.cc

Issue 6976055: More POSIX support for Chromium, consisting mostly of broadening ifdefs. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/automation_proxy_uitest.cc ('k') | chrome/test/plugin/pdf_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chrome_process_util.cc
diff --git a/chrome/test/chrome_process_util.cc b/chrome/test/chrome_process_util.cc
index 52cb1205f44c2e44f1f478438b1dcaa1289413a0..f17402665ab6a296e2b74366bb06cd73df56f255 100644
--- a/chrome/test/chrome_process_util.cc
+++ b/chrome/test/chrome_process_util.cc
@@ -61,8 +61,8 @@ ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
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.
{
@@ -72,9 +72,9 @@ ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
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.
« no previous file with comments | « chrome/test/automation/automation_proxy_uitest.cc ('k') | chrome/test/plugin/pdf_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698