Enabling 64-bit mojo shell to launch 32-bit child to handle nonsfi content.

shell/child_process_host.cc

Index: shell/child_process_host.cc
diff --git a/shell/child_process_host.cc b/shell/child_process_host.cc
index b0bc6ad997593bdf4c53c925fc571ecb5f8f1261..c32b5d1bffe2e88f0c3e8d2eba511fef362e1ed2 100644
--- a/shell/child_process_host.cc
+++ b/shell/child_process_host.cc
@@ -42,11 +42,14 @@ ChildProcessHost::~ChildProcessHost() {
   DCHECK(!child_process_.IsValid());
 }
 
-void ChildProcessHost::Start() {
+void ChildProcessHost::Start(bool require_32_bit) {
   DCHECK(!child_process_.IsValid());
 
   scoped_ptr<LaunchData> launch_data(new LaunchData());
   launch_data->child_path = context_->mojo_shell_child_path();
+  if (require_32_bit)
+    launch_data->child_path =
+        context_->mojo_shell_child_path().InsertBeforeExtensionASCII("_32");

[Mark Seaborn, 2015/09/15 19:42:58]

It seems like this should be inside an "#if defined(ARCH_CPU_X86_64)".  Adding
this suffix is only wanted when mojo_shell is built for x86-64.

[Sean Klein, 2015/09/15 21:35:40]

Using ARCH_CPU_64_BITS to work with ARM too.

 
   // TODO(vtl): Add something for |slave_info|.
   // TODO(vtl): The "unretained this" is wrong (see also below).