Do some plumbing.

shell/out_of_process_native_runner.cc

 // Copyright 2014 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.
 
 #include "shell/out_of_process_native_runner.h"
 
 #include <elf.h>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "shell/child_controller.mojom.h"
 #include "shell/child_process_host.h"
 #include "shell/in_process_native_runner.h"
 
 namespace {
 
-// Determines if content handler must be run as 32 bit application
-// based on elf header. Returns false on error.
+// Determines if content handler must be run as 32 bit application based on the
+// ELF header. Defaults to false on error.
 bool Require32Bit(const base::FilePath& app_path) {
   if (sizeof(void*) == 4) {
-    // CPU arch is already 32 bits
+    // CPU arch is already 32 bits.
     return true;
-  } else {
-    char data[EI_NIDENT];
-    // Read e_ident from the elf file
-    if (sizeof(data) != ReadFile(app_path, data, sizeof(data))) {
-      DCHECK(false);
-      return false;
-    }
-    // Check the magic elf number
-    if (memcmp(data, ELFMAG, SELFMAG)) {
-      DCHECK(false);
-      return false;
-    }
-    // Identify the architecture required
-    return data[EI_CLASS] == ELFCLASS32;
   }
+
+  char data[EI_NIDENT];
+  // Read e_ident from the ELF file.
+  if (ReadFile(app_path, data, sizeof(data)) != sizeof(data)) {
+    DCHECK(false) << "Failed to read ELF header";
+    return false;
+  }
+  // Check the magic ELF number.
+  if (memcmp(data, ELFMAG, SELFMAG)) {
+    DCHECK(false) << "Not an ELF file?";
+    return false;
+  }
+  // Identify the architecture required.
+  return data[EI_CLASS] == ELFCLASS32;
 }
 
 }  // namespace
 
 namespace shell {
 
-OutOfProcessNativeRunner::OutOfProcessNativeRunner(Context* context)
-    : context_(context) {
-}
+OutOfProcessNativeRunner::OutOfProcessNativeRunner(
+    Context* context,
+    const NativeApplicationOptions& options)
+    : context_(context), options_(options) {}
 
 OutOfProcessNativeRunner::~OutOfProcessNativeRunner() {
   if (child_process_host_) {
     // TODO(vtl): Race condition: If |ChildProcessHost::DidStart()| hasn't been
     // called yet, we shouldn't call |Join()| here. (Until |DidStart()|, we may
     // not have a child process to wait on.) Probably we should fix |Join()|.
     child_process_host_->Join();
   }
 }
 
 void OutOfProcessNativeRunner::Start(
     const base::FilePath& app_path,
     mojo::InterfaceRequest<mojo::Application> application_request,
     const base::Closure& app_completed_callback) {
   app_path_ = app_path;
 
   DCHECK(app_completed_callback_.is_null());
   app_completed_callback_ = app_completed_callback;
 
   child_process_host_.reset(new ChildProcessHost(context_));
-  child_process_host_->Start(Require32Bit(app_path));
+
+  NativeApplicationOptions options = options_;
+  if (Require32Bit(app_path))
+    options.require_32_bit = true;
+  child_process_host_->Start(options);
 
   // TODO(vtl): |app_path.AsUTF8Unsafe()| is unsafe.
   child_process_host_->StartApp(
       app_path.AsUTF8Unsafe(), application_request.Pass(),
       base::Bind(&OutOfProcessNativeRunner::AppCompleted,
                  base::Unretained(this)));
 }
 
 void OutOfProcessNativeRunner::AppCompleted(int32_t result) {
   DVLOG(2) << "OutOfProcessNativeRunner::AppCompleted(" << result << ")";
 
   if (child_process_host_) {
     child_process_host_->Join();
     child_process_host_.reset();
   }
   // This object may be deleted by this callback.
   base::Closure app_completed_callback = app_completed_callback_;
   app_completed_callback_.Reset();
   app_completed_callback.Run();
 }
 
 scoped_ptr<NativeRunner> OutOfProcessNativeRunnerFactory::Create(
-    const Options& options) {
+    const NativeApplicationOptions& options) {
   if (options.force_in_process)
     return make_scoped_ptr(new InProcessNativeRunner(context_));
 
-  return make_scoped_ptr(new OutOfProcessNativeRunner(context_));
+  return make_scoped_ptr(new OutOfProcessNativeRunner(context_, options));
 }
 
 }  // namespace shell