Unifying ChildProcessLauncher across platforms.

content/public/browser/browser_message_filter.cc

Index: content/public/browser/browser_message_filter.cc
diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc
index 4fcbe313b5b242a63e0e27e4c63edc886dc37e17..a6521d305acc039a647ea326dee971f41374fdde 100644
--- a/content/public/browser/browser_message_filter.cc
+++ b/content/public/browser/browser_message_filter.cc
@@ -14,16 +14,13 @@
 #include "base/task_runner.h"
 #include "build/build_config.h"
 #include "content/browser/browser_child_process_host_impl.h"
+#include "content/browser/child_process_launcher.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "ipc/ipc_sync_message.h"
 #include "ipc/message_filter.h"
 
-#if defined(OS_ANDROID)
-#include "content/browser/android/child_process_launcher_android.h"
-#endif
-
 using content::BrowserMessageFilter;
 
 namespace content {
@@ -164,12 +161,8 @@ void BrowserMessageFilter::ShutdownForBadMessage() {
   if (command_line->HasSwitch(switches::kDisableKillAfterBadIPC))
     return;
 
-#if defined(OS_ANDROID)
-  // Android requires a different approach for killing.
-  StopChildProcess(peer_process_.Handle());
-#else
-  peer_process_.Terminate(content::RESULT_CODE_KILLED_BAD_MESSAGE, false);
-#endif
+  ChildProcessLauncher::TerminateProcess(

[boliu, 2017/01/13 19:00:56]

there's a comment on TerminateProcess that process has to be started by
ChildProcessLauncher. that doesn't hold for single-process

[Jay Civelli, 2017/01/17 17:50:02]

I am not sure I am following you.
Do we support single process on Android? (in which case StopChildProcess would
not work if I understand correctly, and that's why I added the comment to
ChildProcessLauncher)
On other platforms, yes, we would not respect that restriction.
Clarified the comment in ChildProcessLauncher::TerminateProcess().

[boliu, 2017/01/17 23:28:41]

Yes for webview.
Good point. Looks like that's an existing bug then.
RenderProcessHostImpl::ShutdownForBadMessage has a run_renderer_in_process check
and then just suicides. But looks like there's no equivalent here. Filed
crbug.com/682023

+      peer_process_, content::RESULT_CODE_KILLED_BAD_MESSAGE, false);
 
   // Report a crash, since none will be generated by the killed renderer.
   base::debug::DumpWithoutCrashing();