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

shell/context.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SHELL_CONTEXT_H_
 #define SHELL_CONTEXT_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 46 matching lines @@
   void Run(const GURL& url);
 
   ApplicationManager* application_manager() { return &application_manager_; }
   URLResolver* url_resolver() { return &url_resolver_; }
 
   // Available after Init():
   // This is an absolute path.
   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:
   class NativeViewportApplicationLoader;
 
   // ApplicationManager::Delegate overrides.
   GURL ResolveMappings(const GURL& url) override;
   GURL ResolveMojoURL(const GURL& url) override;
 
   // MasterProcessDelegate implementation.
   void OnShutdownComplete() override;
   void OnSlaveDisconnect(mojo::embedder::SlaveInfo slave_info) override;
 
   void OnApplicationEnd(const GURL& url);
 
   Tracer* const tracer_;
   ApplicationManager application_manager_;
   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_;
   GURL shell_file_root_;
   GURL command_line_cwd_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 }  // namespace shell
 
 #endif  // SHELL_CONTEXT_H_