Kill child processes on bad Mojo messages

content/browser/child_process_launcher.cc

Index: content/browser/child_process_launcher.cc
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index ffd9c695ec677f782df3730b9873b1e55482624d..3e7015c8b6759269ba67873b8228dad52b02591b 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -396,12 +396,14 @@ ChildProcessLauncher::ChildProcessLauncher(
     int child_process_id,
     Client* client,
     const std::string& mojo_child_token,
+    const mojo::edk::ProcessErrorCallback& process_error_callback,
     bool terminate_on_shutdown)
     : client_(client),
       termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
       exit_code_(RESULT_CODE_NORMAL_EXIT),
       zygote_(nullptr),
       starting_(true),
+      process_error_callback_(process_error_callback),
 #if defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) ||  \
     defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \
     defined(UNDEFINED_SANITIZER)
@@ -560,7 +562,8 @@ void ChildProcessLauncher::Notify(ZygoteHandle zygote,
     // Set up Mojo IPC to the new process.
     mojo::edk::ChildProcessLaunched(process_.Handle(),

[jam, 2016/06/13 23:27:12]

nit: ChildProcessLaunche's documentation should mention the thread that
process_error_callback_ is called back on (i.e. if it's fixed or it could be
called back on any thread)

[Ken Rockot(use gerrit already), 2016/06/14 00:28:02]

done

                                     std::move(mojo_host_platform_handle_),
-                                    mojo_child_token_);
+                                    mojo_child_token_,
+                                    process_error_callback_);
   }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)