Wait properly for renderer crashes

chrome/browser/importer/firefox_importer_unittest_utils_mac.cc

 // Copyright (c) 2011 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/browser/importer/firefox_importer_unittest_utils.h"
 
 #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"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_switches.h"
 #include "testing/multiprocess_func_list.h"
 
 #define IPC_MESSAGE_IMPL
 #include "chrome/browser/importer/firefox_importer_unittest_messages_internal.h"
 
 namespace {
 
 // Name of IPC Channel to use for Server<-> Child Communications.
 const char kTestChannelID[] = "T1";
 
 // Launch the child process:
 // |nss_path| - path to the NSS directory holding the decryption libraries.
 // |channel| - IPC Channel to use for communication.
 // |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");
 
   // Set env variable needed for FF encryption libs to load.
   // See "chrome/browser/importer/nss_decryptor_mac.mm" for an explanation of
   // why we need this.
   base::environment_vector env;
   std::pair<std::string, std::string> dyld_override;
   dyld_override.first = "DYLD_FALLBACK_LIBRARY_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();
+  const int ipcfd = channel->TakeClientFileDescriptor();
   if (ipcfd > -1) {

[darin (slow to review), 2011/09/15 05:43:37]

shouldn't this be "ipcfd != -1" ?

[Paweł Hajdan Jr., 2011/09/15 18:36:44]

Done.

     fds_to_map.push_back(std::pair<int,int>(ipcfd, kPrimaryIPCChannel + 3));
   } else {
     return false;
   }
+  file_util::ScopedFD client_file_descriptor_closer(&ipcfd);
 
   bool debug_on_start = CommandLine::ForCurrentProcess()->HasSwitch(
                             switches::kDebugChildren);
   base::LaunchOptions options;
   options.environ = &env;
   options.fds_to_remap = &fds_to_map;
   options.wait = debug_on_start;
   return base::LaunchProcess(cl.argv(), options, handle);
 }
 
@@ skipping 69 matching lines @@
 
   listener_.reset(new FFDecryptorServerChannelListener());
   channel_.reset(new IPC::Channel(kTestChannelID,
                                   IPC::Channel::MODE_SERVER,
                                   listener_.get()));
   CHECK(channel_->Connect());
   listener_->SetSender(channel_.get());
 
   // Spawn child and set up sync IPC connection.
   bool ret = LaunchNSSDecrypterChildProcess(nss_path,
-                                            *(channel_.get()),
+                                            channel_.get(),
                                             &child_process_);
   return ret && (child_process_ != 0);
 }
 
 FFUnitTestDecryptorProxy::~FFUnitTestDecryptorProxy() {
   listener_->QuitClient();
   channel_->Close();
 
   if (child_process_) {
     base::WaitForSingleProcess(child_process_, 5000);
@@ skipping 110 matching lines @@
 
   IPC::Channel channel(kTestChannelID, IPC::Channel::MODE_CLIENT, &listener);
   CHECK(channel.Connect());
   listener.SetSender(&channel);
 
   // run message loop
   MessageLoop::current()->Run();
 
   return 0;
 }