Fix up the pid collection code for Mac OS X so it handles the different bundle names we use for the helpers.

TEST=page cycler tests should show memory for the renderers again.
BUG=19021
Review URL: http://codereview.chromium.org/165531

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23439 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 1 deletions

diff --git a/chrome/test/chrome_process_util.cc b/chrome/test/chrome_process_util.cc
index 6af3250..4454596 100644
--- a/chrome/test/chrome_process_util.cc
+++ b/chrome/test/chrome_process_util.cc
@@ -98,7 +98,19 @@ ChromeProcessList GetRunningChromeProcesses(const FilePath& data_dir) {
     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);