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

shell/context.h

Index: shell/context.h
diff --git a/shell/context.h b/shell/context.h
index 7760f6dd8d2fac461748494b87678ff9b0a0a88f..3ef17ab7874cc29b3e5a8dc6b0af86038015c8bb 100644
--- a/shell/context.h
+++ b/shell/context.h
@@ -64,6 +64,11 @@ class Context : public ApplicationManager::Delegate,
   const base::FilePath& mojo_shell_child_path() const {
     return mojo_shell_child_path_;
   }
+
+  const base::FilePath& mojo_shell_child_path_32_bit() const {
+    return mojo_shell_child_path_32_bit_;
+  }
+
   TaskRunners* task_runners() { return task_runners_.get(); }
 
  private:
@@ -84,6 +89,7 @@ class Context : public ApplicationManager::Delegate,
   URLResolver url_resolver_;
 
   base::FilePath mojo_shell_child_path_;
+  base::FilePath mojo_shell_child_path_32_bit_;

[Petr Hosek, 2015/09/14 19:13:52]

Do you really need a separate variable for the 32-bit version? Couldn't you just
append a suffix to `mojo_shell_child_path_` based on the target architecture?

[Sean Klein, 2015/09/15 18:37:50]

Done.

   scoped_ptr<TaskRunners> task_runners_;
 
   std::set<GURL> app_urls_;