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

Unified Diff: chrome/test/chrome_process_util.cc

Issue 165531: Fix up the pid collection code for Mac OS X so it handles the different bundl... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 4 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/common/chrome_constants.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chrome_process_util.cc
===================================================================
--- chrome/test/chrome_process_util.cc (revision 23431)
+++ chrome/test/chrome_process_util.cc (working copy)
@@ -98,8 +98,20 @@
while ((process_entry = it.NextProcessEntry()))
result.push_back(process_entry->pid);
}
-#endif
+#endif // defined(OS_LINUX)
+#if defined(OS_MACOSX)
+ // On Mac OS X we run the subprocesses with a different bundle, so they end
+ // up with a different name, so we have to collect them in a second pass.
+ {
+ ChildProcessFilter filter(browser_pid);
+ base::NamedProcessIterator it(chrome::kHelperProcessExecutableName,
+ &filter);
+ while ((process_entry = it.NextProcessEntry()))
+ result.push_back(process_entry->pid);
+ }
+#endif // defined(OS_MACOSX)
+
result.push_back(browser_pid);
return result;
« no previous file with comments | « chrome/common/chrome_constants.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698