Wait properly for renderer crashes

chrome/browser/importer/firefox_importer_unittest_utils_mac.cc

Index: chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
index 09a29a4dc82ba516436f5d8f21f73226da2267e4..83d52831236f715e341036d6a1d5e9a53a6fa90b 100644
--- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
+++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
@@ -7,6 +7,7 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
+#include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
@@ -30,7 +31,7 @@ const char kTestChannelID[] = "T1";
 // |handle| - On return, the process handle to use to communicate with the
 // child.
 bool LaunchNSSDecrypterChildProcess(const FilePath& nss_path,
-    const IPC::Channel& channel, base::ProcessHandle* handle) {
+    IPC::Channel* channel, base::ProcessHandle* handle) {
   CommandLine cl(*CommandLine::ForCurrentProcess());
   cl.AppendSwitchASCII(switches::kTestChildProcess, "NSSDecrypterChildProcess");
 
@@ -43,13 +44,13 @@ bool LaunchNSSDecrypterChildProcess(const FilePath& nss_path,
   dyld_override.second = nss_path.value();
   env.push_back(dyld_override);
 
-  base::file_handle_mapping_vector fds_to_map;
-  const int ipcfd = channel.GetClientFileDescriptor();
-  if (ipcfd > -1) {
-    fds_to_map.push_back(std::pair<int,int>(ipcfd, kPrimaryIPCChannel + 3));
-  } else {
+  int ipcfd = channel->TakeClientFileDescriptor();
+  if (ipcfd == -1)
     return false;
-  }
+
+  file_util::ScopedFD client_file_descriptor_closer(&ipcfd);
+  base::file_handle_mapping_vector fds_to_map;
+  fds_to_map.push_back(std::pair<int,int>(ipcfd, kPrimaryIPCChannel + 3));
 
   bool debug_on_start = CommandLine::ForCurrentProcess()->HasSwitch(
                             switches::kDebugChildren);
@@ -139,7 +140,7 @@ bool FFUnitTestDecryptorProxy::Setup(const FilePath& nss_path) {
 
   // Spawn child and set up sync IPC connection.
   bool ret = LaunchNSSDecrypterChildProcess(nss_path,
-                                            *(channel_.get()),
+                                            channel_.get(),
                                             &child_process_);
   return ret && (child_process_ != 0);
 }