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..8e3908f4893cbcf6b2533567f467bd9ad3b0c674 100644
--- a/shell/child_process_host.cc
+++ b/shell/child_process_host.cc
@@ -42,12 +42,16 @@ 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 defined(ARCH_CPU_64_BITS)
+  if (require_32_bit)
+    launch_data->child_path =
+        context_->mojo_shell_child_path().InsertBeforeExtensionASCII("_32");
+#endif
   // TODO(vtl): Add something for |slave_info|.
   // TODO(vtl): The "unretained this" is wrong (see also below).
   mojo::ScopedMessagePipeHandle handle(mojo::embedder::ConnectToSlave(