Fix up the pid collection code for Mac OS X so it handles the different bundl...

chrome/test/chrome_process_util.cc

 // Copyright (c) 2009 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 80 matching lines @@
   // 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 ((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;
 }